From 703a82c818bf3ba40241400a1b5a73e207a3c298 Mon Sep 17 00:00:00 2001 From: Jamie Kyle <113370520+jamiebuilds-signal@users.noreply.github.com> Date: Tue, 18 Apr 2023 16:34:50 -0700 Subject: [PATCH] Skip edit step when forwarding a voice message --- ts/util/maybeForwardMessages.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ts/util/maybeForwardMessages.ts b/ts/util/maybeForwardMessages.ts index 0f517154bf..3b7736b013 100644 --- a/ts/util/maybeForwardMessages.ts +++ b/ts/util/maybeForwardMessages.ts @@ -3,6 +3,7 @@ import { orderBy } from 'lodash'; import type { AttachmentType } from '../types/Attachment'; +import { isVoiceMessage } from '../types/Attachment'; import type { LinkPreviewType } from '../types/message/LinkPreviews'; import type { MessageAttributesType, QuotedMessageType } from '../model-types'; import * as log from '../logging/log'; @@ -46,6 +47,10 @@ export function isDraftEditable(draft: MessageForwardDraft): boolean { if (draft.hasContact) { return false; } + const hasVoiceMessage = draft.attachments?.some(isVoiceMessage) ?? false; + if (hasVoiceMessage) { + return false; + } return true; }