Backups: Handle groupV2 notifications

This commit is contained in:
Scott Nonnenberg 2024-04-30 06:24:21 -07:00 committed by GitHub
parent 4c4ab306eb
commit 5df8924197
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 4563 additions and 301 deletions

View file

@ -4516,9 +4516,10 @@ export class ConversationModel extends window.Backbone
}
}
const ourConversationId =
window.ConversationController.getOurConversationId();
source = source || ourConversationId;
const ourConversation =
window.ConversationController.getOurConversationOrThrow();
source = source || ourConversation.id;
const sourceServiceId = ourConversation.get('serviceId');
this.set({ expireTimer });
@ -4535,7 +4536,7 @@ export class ConversationModel extends window.Backbone
const isFromSyncOperation =
reason === 'group sync' || reason === 'contact sync';
const isFromMe =
window.ConversationController.get(source)?.id === ourConversationId;
window.ConversationController.get(source) === ourConversation;
const isNoteToSelf = isMe(this.attributes);
const shouldBeRead =
(isInitialSync && isFromSyncOperation) || isFromMe || isNoteToSelf;
@ -4547,6 +4548,7 @@ export class ConversationModel extends window.Backbone
expirationTimerUpdate: {
expireTimer,
source,
sourceServiceId,
fromSync,
fromGroupUpdate,
},