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

Allow for empty stickerMessage.emoji and quote.authorAci during backup import

Browse source
This commit is contained in:
trevor-signal 2024-11-20 15:14:58 -05:00 committed by GitHub
parent 5d899d740b
commit d8a52194ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1695,15 +1695,14 @@ export class BackupImportStream extends Writable {
const authorConvo = this.recipientIdToConvo.get(quote.authorId.toNumber()); const authorConvo = this.recipientIdToConvo.get(quote.authorId.toNumber());
strictAssert(authorConvo !== undefined, 'author conversation not found'); strictAssert(authorConvo !== undefined, 'author conversation not found');
strictAssert(
isAciString(authorConvo.serviceId),
'must have ACI for authorId in quote'
);
return { return {
id: getTimestampFromLong(quote.targetSentTimestamp) || null, id: getTimestampFromLong(quote.targetSentTimestamp) || null,
referencedMessageNotFound: quote.targetSentTimestamp == null, referencedMessageNotFound: quote.targetSentTimestamp == null,
authorAci: authorConvo.serviceId, authorAci: isAciString(authorConvo.serviceId)
? authorConvo.serviceId
: undefined,
author: isAciString(authorConvo.serviceId) ? undefined : authorConvo.e164,
text: dropNull(quote.text?.body), text: dropNull(quote.text?.body),
bodyRanges: this.fromBodyRanges(quote.text), bodyRanges: this.fromBodyRanges(quote.text),
isGiftBadge: quote.type === Backups.Quote.Type.GIFT_BADGE, isGiftBadge: quote.type === Backups.Quote.Type.GIFT_BADGE,
@ -1906,7 +1905,6 @@ export class BackupImportStream extends Writable {
sticker: { emoji, packId, packKey, stickerId, data }, sticker: { emoji, packId, packKey, stickerId, data },
}, },
} = chatItem; } = chatItem;
strictAssert(emoji != null, 'stickerMessage must have an emoji');
strictAssert( strictAssert(
packId?.length === STICKERPACK_ID_BYTE_LEN, packId?.length === STICKERPACK_ID_BYTE_LEN,
'stickerMessage must have a valid pack id' 'stickerMessage must have a valid pack id'
@ -1920,7 +1918,7 @@ export class BackupImportStream extends Writable {
return { return {
message: { message: {
sticker: { sticker: {
emoji, emoji: dropNull(emoji),
packId: Bytes.toHex(packId), packId: Bytes.toHex(packId),
packKey: Bytes.toBase64(packKey), packKey: Bytes.toBase64(packKey),
stickerId, stickerId,