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

getQuoteAttachment: Handle attachments with no path

Browse source 
Co-authored-by: Scott Nonnenberg <scott@signal.org>
This commit is contained in:
automated-signal 2024-09-09 17:03:39 -05:00 committed by GitHub
parent 392e18f85a
commit af94da150a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
ts/util/makeQuote.ts
View file

@ -80,14 +80,13 @@ export async function getQuoteAttachment(
return {
contentType: isGIFQuote ? IMAGE_GIF : contentType,
fileName,
thumbnail: thumbnail
? {
...(await loadAttachmentData(thumbnail)),
objectUrl: thumbnail.path
? getLocalAttachmentUrl(thumbnail)
: undefined,
}
: undefined,
thumbnail:
thumbnail && thumbnail.path
? {
...(await loadAttachmentData(thumbnail)),
objectUrl: getLocalAttachmentUrl(thumbnail),
}
: undefined,
};
})
);
@ -103,14 +102,13 @@ export async function getQuoteAttachment(
return {
contentType,
thumbnail: image
? {
...(await loadAttachmentData(image)),
objectUrl: image.path
? getLocalAttachmentUrl(image)
: undefined,
}
: undefined,
thumbnail:
image && image.path
? {
...(await loadAttachmentData(image)),
objectUrl: getLocalAttachmentUrl(image),
}
: undefined,
};
})
);
@ -122,10 +120,12 @@ export async function getQuoteAttachment(
return [
{
contentType,
thumbnail: {
...(await loadAttachmentData(sticker.data)),
objectUrl: path ? getLocalAttachmentUrl(sticker.data) : undefined,
},
thumbnail: path
? {
...(await loadAttachmentData(sticker.data)),
objectUrl: getLocalAttachmentUrl(sticker.data),
}
: undefined,
},
];
}