moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'custom-emoji-fix' into 'main' 

StatusContent: display custom from status emojis, not server emojis

See merge request soapbox-pub/soapbox!3262
This commit is contained in:
Alex Gleason 2024-11-18 14:35:31 +00:00
parent d3d55fd999 82ea850344
commit cf3ae90233
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/status-content.tsx
View File

@ -5,7 +5,6 @@ import parse, { Element, type HTMLReactParserOptions, domToReact, type DOMNode,
import { useState, useRef, useLayoutEffect, useMemo, memo } from 'react'; import { useState, useRef, useLayoutEffect, useMemo, memo } from 'react';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { useCustomEmojis } from 'soapbox/api/hooks/useCustomEmojis.ts';
import Icon from 'soapbox/components/icon.tsx'; import Icon from 'soapbox/components/icon.tsx';
import { getTextDirection } from '../utils/rtl.ts'; import { getTextDirection } from '../utils/rtl.ts';
@ -52,7 +51,6 @@ const StatusContent: React.FC<IStatusContent> = ({
const [collapsed, setCollapsed] = useState(false); const [collapsed, setCollapsed] = useState(false);
const node = useRef<HTMLDivElement>(null); const node = useRef<HTMLDivElement>(null);
const { customEmojis } = useCustomEmojis();
const isOnlyEmoji = useMemo(() => { 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.firstChild?.textContent ?? '';
@ -102,7 +100,7 @@ const StatusContent: React.FC<IStatusContent> = ({
if (shortcodes[i]) { if (shortcodes[i]) {
const [text, shortcode] = shortcodes[i]; const [text, shortcode] = shortcodes[i];
const customEmoji = customEmojis.find((e) => e.shortcode === shortcode); const customEmoji = status.emojis.find((e) => e.shortcode === shortcode);
if (customEmoji) { if (customEmoji) {
parts.push(<img key={i} src={customEmoji.url} alt={shortcode} className='inline-block h-[1em]' />); parts.push(<img key={i} src={customEmoji.url} alt={shortcode} className='inline-block h-[1em]' />);