jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not allow attachments if there are link previews

This commit is contained in:
Josh Perez 2021-12-01 15:19:54 -05:00 committed by GitHub
parent 84407cb005
commit cd91ed6f45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ts/components/CompositionArea.tsx
View File

@ -405,7 +405,7 @@ export const CompositionArea = ({
/>
) : null;
const attButton = (
const attButton = linkPreviewResult ? undefined : (
<div className="CompositionArea__button-cell">
<button
type="button"

14
ts/models/conversations.ts
View File

@ -3895,6 +3895,18 @@ export class ConversationModel extends window.Backbone
[window.ConversationController.getOurConversationIdOrThrow()]
);
// If there are link previews present in the message we shouldn't include
// any attachments as well.
const attachmentsToSend = preview && preview.length ? [] : attachments;
if (preview && preview.length) {
attachments.forEach(attachment => {
if (attachment.path) {
deleteAttachmentData(attachment.path);
}
});
}
// Here we move attachments to disk
const messageWithSchema = await upgradeMessageSchema({
timestamp: now,
@ -3903,7 +3915,7 @@ export class ConversationModel extends window.Backbone
conversationId: this.id,
quote,
preview,
attachments,
attachments: attachmentsToSend,
sent_at: now,
received_at: window.Signal.Util.incrementMessageCounter(),
received_at_ms: now,