fix(bttv): use channel if no user was sent (#5783)

Chatterino · Jan 1, 2025 · 4f1a0ad · 4f1a0ad
1 parent becc100
commit 4f1a0ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Bugfix: Fixed scrollbar highlights being visible in overlay windows. (#5769)
 - Bugfix: Make macos fonts look the same as v2.5.1. (#5775)
 - Bugfix: Fixed 7TV usernames messing with Qt's HTML (#5780)
+- Bugfix: Fixed BTTV emotes occasionally showing the wrong author. (#5783)
 - Dev: Hard-code Boost 1.86.0 in macos CI builders. (#5774)
 
 ## 2.5.2-beta.1

diff --git a/src/providers/bttv/BttvEmotes.cpp b/src/providers/bttv/BttvEmotes.cpp
@@ -92,6 +92,10 @@ CreateEmoteResult createChannelEmote(const QString &channelDisplayName,
     auto name = EmoteName{jsonEmote.value("code").toString()};
     auto author = EmoteAuthor{
         jsonEmote.value("user").toObject().value("displayName").toString()};
+    if (author.string.isEmpty())
+    {
+        author.string = jsonEmote["channel"].toString();
+    }
 
     auto emote = Emote({
         name,