mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Drop release notes channel when importing backup

Browse source
This commit is contained in:
Fedor Indutny 2024-08-12 13:18:19 -07:00 committed by GitHub
parent 9a98ae0a4e
commit f1a7ac8c3d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ts/services/backups/import.ts
View file

@ -258,6 +258,8 @@ export class BackupImportStream extends Writable {
private ourConversation?: ConversationAttributesType; private ourConversation?: ConversationAttributesType;
private pinnedConversations = new Array<[number, string]>(); private pinnedConversations = new Array<[number, string]>();
private customColorById = new Map<number, CustomColorDataType>(); private customColorById = new Map<number, CustomColorDataType>();
private releaseNotesRecipientId: Long | undefined;
private releaseNotesChatId: Long | undefined;
constructor() { constructor() {
super({ objectMode: true }); super({ objectMode: true });
@ -383,6 +385,15 @@ export class BackupImportStream extends Writable {
let convo: ConversationAttributesType; let convo: ConversationAttributesType;
if (recipient.contact) { if (recipient.contact) {
convo = await this.fromContact(recipient.contact); convo = await this.fromContact(recipient.contact);
} else if (recipient.releaseNotes) {
strictAssert(
this.releaseNotesRecipientId == null,
'Duplicate release notes recipient'
);
this.releaseNotesRecipientId = recipient.id;
// Not yet supported
return;
} else if (recipient.self) { } else if (recipient.self) {
strictAssert(this.ourConversation != null, 'Missing account data'); strictAssert(this.ourConversation != null, 'Missing account data');
convo = this.ourConversation; convo = this.ourConversation;
@ -980,6 +991,16 @@ export class BackupImportStream extends Writable {
strictAssert(chat.id != null, 'chat must have an id'); strictAssert(chat.id != null, 'chat must have an id');
strictAssert(chat.recipientId != null, 'chat must have a recipientId'); strictAssert(chat.recipientId != null, 'chat must have a recipientId');
// Drop release notes chat
if (this.releaseNotesRecipientId?.eq(chat.recipientId)) {
strictAssert(
this.releaseNotesChatId == null,
'Duplicate release notes chat'
);
this.releaseNotesChatId = chat.id;
return;
}
const conversation = this.recipientIdToConvo.get( const conversation = this.recipientIdToConvo.get(
chat.recipientId.toNumber() chat.recipientId.toNumber()
); );
@ -1045,6 +1066,11 @@ export class BackupImportStream extends Writable {
strictAssert(item.dateSent != null, `${logId}: must have a dateSent`); strictAssert(item.dateSent != null, `${logId}: must have a dateSent`);
strictAssert(timestamp, `${logId}: must have a timestamp`); strictAssert(timestamp, `${logId}: must have a timestamp`);
if (this.releaseNotesChatId?.eq(item.chatId)) {
// Drop release notes messages
return;
}
const chatConvo = this.chatIdToConvo.get(item.chatId.toNumber()); const chatConvo = this.chatIdToConvo.get(item.chatId.toNumber());
strictAssert( strictAssert(
chatConvo !== undefined, chatConvo !== undefined,