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

Allow sends of quote attachments with no thumbnail

Browse source
This commit is contained in:
Scott Nonnenberg 2023-04-21 11:26:49 -07:00 • committed by GitHub
parent e211837bcd
commit bedd2c8a15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -656,8 +656,9 @@ async function uploadMessageQuote(
} }
const uploadedAttachments = await uploadQueue.addAll( const uploadedAttachments = await uploadQueue.addAll(
loadedQuote.attachments.map( loadedQuote.attachments
attachment => async (): Promise<OutgoingQuoteAttachmentType> => { .filter(attachment => attachment.thumbnail)
.map(attachment => async (): Promise<OutgoingQuoteAttachmentType> => {
const { thumbnail } = attachment; const { thumbnail } = attachment;
strictAssert(thumbnail, 'Quote attachment must have a thumbnail'); strictAssert(thumbnail, 'Quote attachment must have a thumbnail');
@ -668,8 +669,7 @@ async function uploadMessageQuote(
fileName: attachment.fileName, fileName: attachment.fileName,
thumbnail: uploaded, thumbnail: uploaded,
}; };
} })
)
); );
// Update message with attachment digests // Update message with attachment digests
@ -680,6 +680,10 @@ async function uploadMessageQuote(
const newQuote = { const newQuote = {
...oldQuote, ...oldQuote,
attachments: oldQuote.attachments.map((attachment, index) => { attachments: oldQuote.attachments.map((attachment, index) => {
if (!attachment.thumbnail) {
return attachment;
}
strictAssert( strictAssert(
attachment.path === loadedQuote.attachments.at(index)?.path, attachment.path === loadedQuote.attachments.at(index)?.path,
`${logId}: Quote attachment ${index} was updated from under us` `${logId}: Quote attachment ${index} was updated from under us`