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

Fix forwarding messages with undownloadable attachments

Browse source
This commit is contained in:
ayumi-signal 2025-02-12 06:52:21 -08:00 • committed by GitHub
parent a02a111358
commit 7fb898441b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ts/state/ducks/globalModals.ts
View file

@ -34,7 +34,10 @@ import {
MESSAGE_EXPIRED,
actions as conversationsActions,
} from './conversations';
import { isDownloaded } from '../../types/Attachment';
import {
isDownloaded,
isPermanentlyUndownloadable,
} from '../../types/Attachment';
import type { ButtonVariant } from '../../components/Button';
import type { MessageRequestState } from '../../components/conversation/MessageRequestActionsConfirmation';
import type { MessageForwardDraft } from '../../types/ForwardDraft';
@ -667,7 +670,13 @@ function toggleForwardMessagesModal(
}
const { attachments = [] } = message.attributes;
if (!attachments.every(isDownloaded)) {
if (
!attachments.every(
attachment =>
isDownloaded(attachment) ||
isPermanentlyUndownloadable(attachment)
)
) {
dispatch(
conversationsActions.kickOffAttachmentDownload({ messageId })
);
@ -679,7 +688,12 @@ function toggleForwardMessagesModal(
const messageProps = messagePropsSelector(message.attributes);
const messageDraft = toMessageForwardDraft(
messageProps,
{
...messageProps,
attachments: attachments.filter(
attachment => !isPermanentlyUndownloadable(attachment)
),
},
conversationSelector
);