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

Document Message v4, remove data-free thumbnails

Browse source
This commit is contained in:
Scott Nonnenberg 2018-04-23 16:43:25 -07:00
parent 6599535cbb
commit bf81c3db63
No known key found for this signature in database
GPG key ID: 5F82280C35134661
2 changed files with 43 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
js/modules/types/message.js
View file

@ -18,6 +18,9 @@ const PRIVATE = 'private';
// - Attachments: Sanitize Unicode order override characters.
// Version 3
// - Attachments: Write attachment data to disk and store relative path to it.
// Version 4
// - Quotes: Write thumbnail data to disk and store relative path to it.
const INITIAL_SCHEMA_VERSION = 0;
@ -158,13 +161,19 @@ exports._mapQuotedAttachments = upgradeAttachment => async (message, context) =>
}
const upgradeWithContext = async (attachment) => {
if (!attachment || !attachment.thumbnail) {
const { thumbnail } = attachment;
if (!thumbnail) {
return attachment;
}
const thumbnail = await upgradeAttachment(attachment.thumbnail, context);
if (!thumbnail.data) {
console.log('Quoted attachment did not have thumbnail data; removing it');
return omit(attachment, ['thumbnail']);
}
const upgradedThumbnail = await upgradeAttachment(thumbnail, context);
return Object.assign({}, attachment, {
thumbnail,
thumbnail: upgradedThumbnail,
});
};