Merge pull request #1340 from h3poteto/fix/firefish-emoji

Fix custom emoji reaction for Firefish
h3poteto · Feb 8, 2024 · 26451cf · 26451cf
2 parents d7b21c8 + 959123b
commit 26451cf
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "@tauri-apps/api": "1.5.3",
     "dayjs": "^1.11.10",
     "emoji-mart": "^5.5.2",
-    "megalodon": "9.2.0",
+    "megalodon": "9.2.1",
     "next": "^14.1.0",
     "parse-link-header": "^2.0.0",
     "react": "^18.2.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -21,7 +21,7 @@ sqlx  = { version = "0.7.3", features = ["runtime-tokio-rustls", "sqlite", "migr
 tokio = { version = "1.35", features = ["full"] }
 futures = "0.3"
 directories = "5.0"
-megalodon = "0.12.0"
+megalodon = "0.12.1"
 open = "5.0"
 log = "0.4"
 reqwest = { version = "0.11", features = ["json", "multipart", "stream"] }

diff --git a/src/components/timelines/status/Actions.tsx b/src/components/timelines/status/Actions.tsx
@@ -126,7 +126,7 @@ const Actions: React.FC<Props> = props => {
   }
 
   const onEmojiSelect = async emoji => {
-    let name = emoji.shortcodes
+    let name = emoji.name
     if (emoji.native) {
       name = emoji.native
     }

diff --git a/src/components/timelines/status/Status.tsx b/src/components/timelines/status/Status.tsx
@@ -178,7 +178,15 @@ const Status: React.FC<Props> = props => {
               )}
               {status.emoji_reactions &&
                 status.emoji_reactions.map(e => (
-                  <Button appearance="subtle" size="sm" key={e.name} onClick={() => emojiClicked(e)} active={e.me}>
+                  <Button
+                    appearance="subtle"
+                    size="sm"
+                    key={e.name}
+                    onClick={() => emojiClicked(e)}
+                    active={e.me}
+                    disabled={e.name.includes('@')}
+                    title={e.name}
+                  >
                     {e.url ? (
                       <>
                         <img src={e.url} style={{ height: '20px' }} /> <span style={{ marginLeft: '0.2em' }}>{e.count}</span>