Merge pull request #94 from HiDeoo/hd-duplicate-emote-fix

Fix a rendering issue with some third-party emotes
HiDeoo · Mar 19, 2022 · 9c69372 · 9c69372
2 parents c3f6b59 + 6b30c89
commit 9c69372
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.17.2
+
+### 🐛 Bug Fix
+
+- Fix a rendering issue with some third-party emotes.
+
 # 1.17.1
 
 ### 🐛 Bug Fix

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yata",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "Twitch chat client",
   "author": "HiDeoo",
   "license": "MIT",

diff --git a/src/libs/Message.ts b/src/libs/Message.ts
@@ -301,10 +301,16 @@ export default class Message implements Serializable<SerializedMessage> {
    * @param emotes - The message emotes.
    */
   private parseEmotes(parsedMessage: string[], emotes: Emotes) {
+    const parsedRanges = new Set<string>()
+
     _.forEach(emotes, (ranges, id) => {
       const [providerPrefix, emoteId] = id.split('-')
 
       _.forEach(ranges, (range) => {
+        if (parsedRanges.has(range)) {
+          return
+        }
+
         const strIndexes = range.split('-')
         const indexes = [parseInt(strIndexes[0], 10), parseInt(strIndexes[1], 10)]
         const name = []
@@ -324,6 +330,8 @@ export default class Message implements Serializable<SerializedMessage> {
 
         if (!_.isNil(provider)) {
           parsedMessage[indexes[0]] = provider.getEmoteTag(isTwitchEmote ? id : emoteId, emoteName)
+
+          parsedRanges.add(range)
         }
       })
     })