removing blocked convos no longer appear in regular inbox and using processing of polled swarm messages to infer approval.

pull/2222/head
warrickct 4 years ago
parent 18a739b05b
commit 2957c131c0

@ -248,13 +248,18 @@ async function handleRegularMessage(
if (type === 'incoming') { if (type === 'incoming') {
updateReadStatus(message, conversation); updateReadStatus(message, conversation);
if (conversation.isPrivate()) {
await conversation.setDidApproveMe(true); await conversation.setDidApproveMe(true);
} }
}
if (type === 'outgoing') { if (type === 'outgoing') {
await handleSyncedReceipts(message, conversation); await handleSyncedReceipts(message, conversation);
if (conversation.isPrivate()) {
await conversation.setIsApproved(true); await conversation.setIsApproved(true);
} }
}
const conversationActiveAt = conversation.get('active_at'); const conversationActiveAt = conversation.get('active_at');
if (!conversationActiveAt || (message.get('sent_at') || 0) > conversationActiveAt) { if (!conversationActiveAt || (message.get('sent_at') || 0) > conversationActiveAt) {

@ -352,7 +352,7 @@ export const _getLeftPaneLists = (
directConversations.push(conversation); directConversations.push(conversation);
} }
if (!conversation.isApproved && !conversation.isBlocked) { if (!conversation.isApproved || !conversation.isBlocked) {
// dont increase unread counter, don't push to convo list. // dont increase unread counter, don't push to convo list.
continue; continue;
} }

Loading…
Cancel
Save