From a5d904eb1e415bb6af207d366e98ddab4396c929 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 18 Nov 2024 22:06:18 -0600 Subject: [PATCH] StatusContent: fix isOnlyEmoji on multiple lines --- src/components/status-content.tsx | 2 +- src/features/chats/components/chat-message.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/status-content.tsx b/src/components/status-content.tsx index 5ff45f88f..91ec91e25 100644 --- a/src/components/status-content.tsx +++ b/src/components/status-content.tsx @@ -53,7 +53,7 @@ const StatusContent: React.FC = ({ const node = useRef(null); const isOnlyEmoji = useMemo(() => { - const textContent = new DOMParser().parseFromString(status.content, 'text/html').body.firstChild?.textContent ?? ''; + const textContent = new DOMParser().parseFromString(status.content, 'text/html').body.textContent ?? ''; return Boolean(/^\p{Extended_Pictographic}+$/u.test(textContent) && (graphemesplit(textContent).length <= BIG_EMOJI_LIMIT)); }, [status.content]); diff --git a/src/features/chats/components/chat-message.tsx b/src/features/chats/components/chat-message.tsx index ad2b7694a..f26fb80cb 100644 --- a/src/features/chats/components/chat-message.tsx +++ b/src/features/chats/components/chat-message.tsx @@ -99,8 +99,8 @@ const ChatMessage = (props: IChatMessage) => { && lastReadMessageTimestamp >= new Date(chatMessage.created_at); const isOnlyEmoji = useMemo(() => { - const textContent = new DOMParser().parseFromString(content, 'text/html').body.firstChild?.textContent; - return Boolean(textContent && /^\p{Extended_Pictographic}+$/u.test(textContent) && (graphemesplit(textContent).length <= BIG_EMOJI_LIMIT)); + const textContent = new DOMParser().parseFromString(content, 'text/html').body.textContent ?? ''; + return Boolean(/^\p{Extended_Pictographic}+$/u.test(textContent) && (graphemesplit(textContent).length <= BIG_EMOJI_LIMIT)); }, [content]); const emojiReactionRows = useMemo(() => {