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

Apply mention ranges to body when multi-forwarding

Browse source
This commit is contained in:
Jamie Kyle 2023-10-30 11:39:14 -07:00 • committed by GitHub
parent 063a1d9df3
commit 6bd802a03d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 738 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ts/components/ForwardMessagesModal.tsx
View file

@ -32,7 +32,7 @@ import { LinkPreviewSourceType } from '../types/LinkPreview';
import { ToastType } from '../types/Toast';
import type { ShowToastAction } from '../state/ducks/toast';
import type { HydratedBodyRangesType } from '../types/BodyRange';
import { BodyRange } from '../types/BodyRange';
import { applyRangesToText } from '../types/BodyRange';
import { UserText } from './UserText';
import { Modal } from './Modal';
import { SizeObserver } from '../hooks/useSizeObserver';
@ -135,11 +135,25 @@ export function ForwardMessagesModal({
} else {
doForwardMessages(
conversationIds,
drafts.map(draft => ({
...draft,
drafts.map(draft => {
// We don't keep @mention bodyRanges in multi-forward scenarios
bodyRanges: draft.bodyRanges?.filter(BodyRange.isFormatting),
}))
const result = applyRangesToText(
{
body: draft.messageBody ?? '',
bodyRanges: draft.bodyRanges ?? [],
},
{
replaceMentions: true,
replaceSpoilers: false,
}
);
return {
...draft,
messageBody: result.body,
bodyRanges: result.bodyRanges,
};
})
);
}
}, [