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

Replace mentions with text when forwarding

Browse source
This commit is contained in:
Scott Nonnenberg 2022-07-21 09:26:11 -07:00 • committed by GitHub
parent 1f65a4491f
commit 026f574fdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

34
ts/state/smart/ForwardMessageModal.tsx
View file

@ -10,7 +10,11 @@ import * as log from '../../logging/log';
import { ForwardMessageModal } from '../../components/ForwardMessageModal';
import { LinkPreviewSourceType } from '../../types/LinkPreview';
import { ToastMessageBodyTooLong } from '../../components/ToastMessageBodyTooLong';
import { getAllComposableConversations } from '../selectors/conversations';
import type { GetConversationByIdType } from '../selectors/conversations';
import {
getAllComposableConversations,
getConversationSelector,
} from '../selectors/conversations';
import { getEmojiSkinTone } from '../selectors/items';
import { getIntl, getTheme, getRegionCode } from '../selectors/user';
import { getLinkPreview } from '../selectors/linkPreviews';
@ -27,6 +31,29 @@ import { useActions as useEmojiActions } from '../ducks/emojis';
import { useActions as useItemsActions } from '../ducks/items';
import { useGlobalModalActions } from '../ducks/globalModals';
import { useLinkPreviewActions } from '../ducks/linkPreviews';
import { processBodyRanges } from '../selectors/message';
import { getTextWithMentions } from '../../util/getTextWithMentions';
function renderMentions(
message: ForwardMessagePropsType,
conversationSelector: GetConversationByIdType
): string | undefined {
const { text } = message;
if (!text) {
return text;
}
const bodyRanges = processBodyRanges(message, {
conversationSelector,
});
if (bodyRanges && bodyRanges.length) {
return getTextWithMentions(bodyRanges, text);
}
return text;
}
export function SmartForwardMessageModal(): JSX.Element | null {
const forwardMessageProps = useSelector<
@ -35,6 +62,7 @@ export function SmartForwardMessageModal(): JSX.Element | null {
>(state => state.globalModals.forwardMessageProps);
const candidateConversations = useSelector(getAllComposableConversations);
const getPreferredBadge = useSelector(getPreferredBadgeSelector);
const getConversation = useSelector(getConversationSelector);
const i18n = useSelector(getIntl);
const linkPreviewForSource = useSelector(getLinkPreview);
const recentEmojis = useSelector(selectRecentEmojis);
@ -58,6 +86,8 @@ export function SmartForwardMessageModal(): JSX.Element | null {
toggleForwardMessageModal();
}
const cleanedBody = renderMentions(forwardMessageProps, getConversation);
return (
<ForwardMessageModal
attachments={attachments}
@ -96,7 +126,7 @@ export function SmartForwardMessageModal(): JSX.Element | null {
linkPreview={linkPreviewForSource(
LinkPreviewSourceType.ForwardMessageModal
)}
messageBody={forwardMessageProps.text}
messageBody={cleanedBody}
onClose={closeModal}
onEditorStateChange={(
messageText: string,