Merge remote-tracking branch 'origin/main'

fluxer_app/src/features/channel/components/MessageActionMenu.tsx

@@ -3,7 +3,6 @@
 import {
 	canReportMessage,
 	createMessageActionHandlers,
-	getCopyableMessageText,
 	getEffectiveContent,
 	isClientSystemMessage,
 	isEmbedsSuppressed,
@@ -180,7 +179,6 @@ export const useMessageActionMenuData = (
 	);
 	const developerMode = UserSettings.developerMode;
 	const effectiveContent = useMemo(() => getEffectiveContent(message), [message]);
-	const copyableMessageText = useMemo(() => getCopyableMessageText(message, i18n), [message, i18n.locale]);
 	const canManageMessages = useMemo(
 		() =>
 			permissions != null &&
@@ -366,7 +364,7 @@ export const useMessageActionMenuData = (
 					),
 				});
 			}
-			if (copyableMessageText) {
+			if (effectiveContent) {
 				utilityActions.push({
 					id: messageActionMenuItemIds.copyMessage,
 					icon: <CopyMessageTextIcon size={20} data-flx="channel.message-action-menu.groups.copy-message-text-icon" />,
@@ -460,7 +458,6 @@ export const useMessageActionMenuData = (
 		isSpeaking,
 		voiceReady,
 		effectiveContent,
-		copyableMessageText,
 		handleSpeakMessage,
 		handleReportMessage,
 		handleDebugMessage,

fluxer_app/src/features/channel/components/MessageActionUtils.tsx

@@ -18,7 +18,6 @@ import * as SavedMessageCommands from '@app/features/messaging/commands/SavedMes
 import {ForwardModal, type ForwardModalSuccess} from '@app/features/messaging/components/modals/ForwardModal';
 import type {Message} from '@app/features/messaging/models/MessagingMessage';
 import SavedMessages from '@app/features/messaging/state/SavedMessages';
-import {buildRawMessageContentCopyText} from '@app/features/messaging/utils/MessageCopyTextUtils';
 import {buildMessageJumpLink} from '@app/features/messaging/utils/MessageLinkUtils';
 import {retryFailedMessage} from '@app/features/messaging/utils/MessageRetryUtils';
 import {type ReactionEmoji, toReactionEmoji} from '@app/features/messaging/utils/ReactionUtils';
@@ -94,10 +93,6 @@ export function getEffectiveContent(message: Message): string {
 	return '';
 }
 
-export function getCopyableMessageText(message: Message, _i18n: I18n): string {
-	return buildRawMessageContentCopyText(message);
-}
-
 export function isEmbedsSuppressed(message: Message): boolean {
 	return (message.flags & MessageFlags.SUPPRESS_EMBEDS) !== 0;
 }
@@ -324,7 +319,7 @@ export function createMessageActionHandlers(
 		onClose?.();
 	};
 	const handleCopyMessage = () => {
-		const content = getCopyableMessageText(message, i18n);
+		const content = getEffectiveContent(message);
 		if (content) {
 			TextCopyCommands.copy(i18n, content);
 			onClose?.();
@@ -544,7 +539,7 @@ export function requestMessageForward(
 }
 
 export function requestCopyMessageText(message: Message, i18n: I18n): void {
-	const content = getCopyableMessageText(message, i18n);
+	const content = getEffectiveContent(message);
 	if (!content) return;
 	void TextCopyCommands.copy(i18n, content);
 }

fluxer_app/src/features/messaging/utils/MessageCopyTextUtils.ts

@@ -248,10 +248,6 @@ export function buildMessageSnapshotCopyText(snapshot: MessageSnapshot, options:
 	return joinCopyBlocks(blocks);
 }
 
-export function buildRawMessageContentCopyText(message: Pick<Message, 'content'>): string {
-	return message.content;
-}
-
 export function buildUserMessageCopyText(message: Message, options: MessageCopyTextOptions): string {
 	const blocks: Array<string> = [];
 	const messageOptions: MessageCopyTextOptions = {