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

uploadMessageSticker: Compare against previous sticker, not cache

Browse source
This commit is contained in:
Scott Nonnenberg 2023-04-21 12:33:05 -07:00 • committed by GitHub
parent bedd2c8a15
commit 07bad13fa1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ts/jobs/helpers/sendNormalMessage.ts
View file

@ -791,38 +791,41 @@ async function uploadMessageSticker(
// See uploadMessageQuote for comment on how we do caching for these // See uploadMessageQuote for comment on how we do caching for these
// attachments. // attachments.
const sticker = const startingSticker = message.get('sticker');
const stickerWithData =
message.cachedOutgoingStickerData || message.cachedOutgoingStickerData ||
(await loadStickerData(message.get('sticker'))); (await loadStickerData(startingSticker));
if (!sticker) { if (!stickerWithData) {
return undefined; return undefined;
} }
const uploaded = await uploadQueue.add(() => uploadAttachment(sticker.data)); const uploaded = await uploadQueue.add(() =>
uploadAttachment(stickerWithData.data)
);
// Add digest to the attachment // Add digest to the attachment
const logId = `uploadMessageSticker(${message.idForLogging()}`; const logId = `uploadMessageSticker(${message.idForLogging()}`;
const oldSticker = message.get('sticker'); const existingSticker = message.get('sticker');
strictAssert( strictAssert(
oldSticker?.data !== undefined, existingSticker?.data !== undefined,
`${logId}: Sticker was uploaded, but message doesn't ` + `${logId}: Sticker was uploaded, but message doesn't ` +
'have a sticker anymore' 'have a sticker anymore'
); );
strictAssert( strictAssert(
oldSticker.data.path === sticker.data?.path, existingSticker.data.path === startingSticker?.data?.path,
`${logId}: Sticker was uploaded, but message has a different sticker` `${logId}: Sticker was uploaded, but message has a different sticker`
); );
message.set('sticker', { message.set('sticker', {
...oldSticker, ...existingSticker,
data: { data: {
...oldSticker.data, ...existingSticker.data,
digest: Bytes.toBase64(uploaded.digest), digest: Bytes.toBase64(uploaded.digest),
}, },
}); });
return { return {
...sticker, ...stickerWithData,
data: uploaded, data: uploaded,
}; };
} }