Prevent invalid mxc from getting used (#2609)

2026-02-14 11:42:28 +05:30
parent 074c555294
commit 3522751a15
9 changed files with 24 additions and 15 deletions
@@ -88,6 +88,8 @@ export function EmoticonAutocomplete({
      {autoCompleteEmoticon.map((emoticon) => {
        const isCustomEmoji = 'url' in emoticon;
        const key = isCustomEmoji ? emoticon.url : emoticon.unicode;
+        const customEmojiUrl = mxcUrlToHttp(mx, key, useAuthentication);
+
        return (
          <MenuItem
            key={emoticon.shortcode + key}
@@ -98,11 +100,11 @@ export function EmoticonAutocomplete({
            }
            onClick={() => handleAutocomplete(key, emoticon.shortcode)}
            before={
-              isCustomEmoji ? (
+              isCustomEmoji && customEmojiUrl ? (
                <Box
                  shrink="No"
                  as="img"
-                  src={mxcUrlToHttp(mx, key, useAuthentication) || key}
+                  src={customEmojiUrl}
                  alt={emoticon.shortcode}
                  style={{ width: toRem(24), height: toRem(24), objectFit: 'contain' }}
                />