From 9f5a5b16d3fbe0c487614982cdb777c72c773d3b Mon Sep 17 00:00:00 2001
From: Hampus <hampus@fluxer.app>
Date: Tue, 25 Aug 2026 12:56:39 +0200
Subject: [PATCH] fix(app): resolve custom emoji before gating the edit length
 (#1999)

---
 .../channel/components/EditingMessageInput.tsx | 18 ++++++++++--------
 .../channel/components/UserMessage.tsx         |  9 +--------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/fluxer_app/src/features/channel/components/EditingMessageInput.tsx b/fluxer_app/src/features/channel/components/EditingMessageInput.tsx
index 982084059..0cced8f5f 100644
--- a/fluxer_app/src/features/channel/components/EditingMessageInput.tsx
+++ b/fluxer_app/src/features/channel/components/EditingMessageInput.tsx
@@ -23,6 +23,7 @@ import MessageEdit from '@app/features/messaging/state/MessageEdit';
 import {applyMarkdownSegments} from '@app/features/messaging/utils/MarkdownToSegmentUtils';
 import type {MentionSegment} from '@app/features/messaging/utils/TextareaSegmentManager';
 import {TextareaSegmentManager} from '@app/features/messaging/utils/TextareaSegmentManager';
+import {resolveTypedEmojiShortcodes} from '@app/features/messaging/utils/TypedEmojiShortcodeUtils';
 import {ComponentBus} from '@app/features/platform/utils/ComponentBus';
 import * as PopoutCommands from '@app/features/ui/commands/PopoutCommands';
 import FocusRing from '@app/features/ui/focus_ring/FocusRing';
@@ -35,9 +36,7 @@ import {SmileyIcon} from '@phosphor-icons/react';
 import {clsx} from 'clsx';
 import {observer} from 'mobx-react-lite';
 import type React from 'react';
-import {useCallback, useEffect, useRef, useState} from 'react';
-
-const EDITING_ALLOWED_TRIGGERS = ['emoji', 'mention', 'channel'] as const;
+import {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 
 interface EditingFocusRequest {
 	requestedChannelId: string | null;
@@ -101,6 +100,10 @@ export const EditingMessageInput = observer(
 			return {display, segments: segments.getSegmentsCopy(), wire};
 		});
 		const [actualContent, setActualContent] = useState(initial.wire);
+		const resolvedContent = useMemo(
+			() => resolveTypedEmojiShortcodes({content: actualContent, channel, i18n}),
+			[actualContent, channel, i18n],
+		);
 		const composerRef = useRef<LexicalRichInputHandle | null>(null);
 		const containerRef = useRef<HTMLDivElement>(null);
 		const editableRef = useRef<HTMLElement | null>(null);
@@ -144,11 +147,11 @@ export const EditingMessageInput = observer(
 			}
 		}, []);
 		const handleSubmit = useCallback(() => {
-			if (editingDisabled || actualContent.length > maxMessageLength) {
+			if (editingDisabled || resolvedContent.length > maxMessageLength) {
 				return;
 			}
-			onSubmit(actualContent);
-		}, [actualContent, editingDisabled, maxMessageLength, onSubmit]);
+			onSubmit(resolvedContent);
+		}, [editingDisabled, maxMessageLength, onSubmit, resolvedContent]);
 		const handleKeyDown = useCallback(
 			(event: React.KeyboardEvent<HTMLElement>) => {
 				if (event.defaultPrevented) {
@@ -264,7 +267,7 @@ export const EditingMessageInput = observer(
 		if (mobileLayout.enabled) {
 			handleExpressionPickerButtonClick = () => setExpressionPickerOpen(true);
 		}
-		let displayContentLength = actualContent.length;
+		let displayContentLength = resolvedContent.length;
 		if (editingDisabled) {
 			displayContentLength = 0;
 		}
@@ -287,7 +290,6 @@ export const EditingMessageInput = observer(
 									placeholder={placeholderText}
 									disabled={editingDisabled}
 									channel={channel}
-									allowedTriggers={[...EDITING_ALLOWED_TRIGGERS]}
 									markdown={true}
 									singleLine={!mobileLayout.enabled}
 									size="chat"
diff --git a/fluxer_app/src/features/channel/components/UserMessage.tsx b/fluxer_app/src/features/channel/components/UserMessage.tsx
index d7324998d..505f79825 100644
--- a/fluxer_app/src/features/channel/components/UserMessage.tsx
+++ b/fluxer_app/src/features/channel/components/UserMessage.tsx
@@ -33,7 +33,6 @@ import {
 import {retryFailedMessage} from '@app/features/messaging/utils/MessageRetryUtils';
 import {NodeType} from '@app/features/messaging/utils/markdown/parser/Enums';
 import {SpoilerSyncProvider} from '@app/features/messaging/utils/SpoilerUtils';
-import {resolveTypedEmojiShortcodes} from '@app/features/messaging/utils/TypedEmojiShortcodeUtils';
 import {compactMarkdownProps} from '@app/features/theme/layout/MessageLayoutAttributes';
 import markupStyles from '@app/features/theme/styles/Markup.module.css';
 import styles from '@app/features/theme/styles/Message.module.css';
@@ -194,11 +193,7 @@ export const UserMessage = observer(() => {
 			if (message.messageSnapshots) {
 				return;
 			}
-			const content = resolveTypedEmojiShortcodes({
-				content: (actualContent ?? '').trim(),
-				channel,
-				i18n,
-			});
+			const content = (actualContent ?? '').trim();
 			if (!content) {
 				if (canSubmitEmptyMessageEdit(message)) {
 					if (message.content.length === 0) {
@@ -232,10 +227,8 @@ export const UserMessage = observer(() => {
 			});
 		},
 		[
-			channel,
 			channel.id,
 			handleDelete,
-			i18n,
 			message,
 			message.id,
 			message.messageSnapshots,