Zerowidth Emotes (7TV) (#36)

Co-authored-by: Tal Neoran <talneoran@gmail.com> Co-authored-by: zneix <zneix@zneix.eu>
SevenTV · Aug 6, 2021 · 2d3fe1f · 2d3fe1f
1 parent b251ac9
commit 2d3fe1f
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 2 deletions.
diff --git a/src/messages/Emote.hpp b/src/messages/Emote.hpp
@@ -14,6 +14,7 @@ struct Emote {
     ImageSet images;
     Tooltip tooltip;
     Url homePage;
+    bool zeroWidth;
 
     // FOURTF: no solution yet, to be refactored later
     const QString &getCopyString() const

diff --git a/src/messages/MessageElement.hpp b/src/messages/MessageElement.hpp
@@ -139,7 +139,7 @@ enum class MessageElementFlag : int64_t {
     OriginalLink = (1LL << 30),
 
     // ZeroWidthEmotes are emotes that are supposed to overlay over any pre-existing emotes
-    // e.g. BTTV's SoSnowy during christmas season
+    // e.g. BTTV's SoSnowy during christmas season or zerowidth 7TV emotes
     ZeroWidthEmote = (1LL << 31),
 
     // (1LL << 32) is used by SeventvEmoteImage, it is next to FfzEmote

diff --git a/src/providers/seventv/SeventvEmotes.cpp b/src/providers/seventv/SeventvEmotes.cpp
@@ -55,6 +55,11 @@ namespace {
                                       .toObject()
                                       .value("display_name")
                                       .toString()};
+        int64_t visibility = jsonEmote.toObject().value("visibility").toInt();
+        auto visibilityFlags =
+            SeventvEmoteVisibilityFlags(SeventvEmoteVisibilityFlag(visibility));
+        bool zeroWidth =
+            visibilityFlags.has(SeventvEmoteVisibilityFlag::ZeroWidth);
 
         auto emote = Emote(
             {name,
@@ -64,7 +69,7 @@ namespace {
              Tooltip{QString("%1<br>%2 7TV Emote<br>By: %3")
                          .arg(name.string, (isGlobal ? "Global" : "Channel"),
                               author.string)},
-             Url{emoteLinkFormat.arg(id.string)}});
+             Url{emoteLinkFormat.arg(id.string)}, zeroWidth});
 
         auto result = CreateEmoteResult({id, name, emote});
         return result;

diff --git a/src/providers/seventv/SeventvEmotes.hpp b/src/providers/seventv/SeventvEmotes.hpp
@@ -9,6 +9,24 @@
 
 namespace chatterino {
 
+// https://github.com/SevenTV/ServerGo/blob/dfe867f991e8cfd7a79d93b9bec681216c32abdb/src/mongo/datastructure/datastructure.go#L56-L67
+enum class SeventvEmoteVisibilityFlag : int64_t {
+    None = 0LL,
+
+    Private = (1LL << 0),
+    Global = (1LL << 1),
+    Unlisted = (1LL << 2),
+
+    OverrideBttv = (1LL << 3),
+    OverrideFfz = (1LL << 4),
+    OverrideTwitchGlobal = (1LL << 5),
+    OverrideTwitchSubscriber = (1LL << 6),
+
+    ZeroWidth = (1LL << 7),
+};
+
+using SeventvEmoteVisibilityFlags = FlagsEnum<SeventvEmoteVisibilityFlag>;
+
 struct Emote;
 using EmotePtr = std::shared_ptr<const Emote>;
 class EmoteMap;

diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp
@@ -1011,6 +1011,10 @@ Outcome TwitchMessageBuilder::tryAppendEmote(const EmoteName &name)
              (emote = this->twitchChannel->seventvEmote(name)))
     {
         flags = MessageElementFlag::SeventvEmote;
+        if (emote.value()->zeroWidth)
+        {
+            flags.set(MessageElementFlag::ZeroWidthEmote);
+        }
     }
     else if (this->twitchChannel &&
              (emote = this->twitchChannel->bttvEmote(name)))
@@ -1020,6 +1024,10 @@ Outcome TwitchMessageBuilder::tryAppendEmote(const EmoteName &name)
     else if ((emote = globalSeventvEmotes.emote(name)))
     {
         flags = MessageElementFlag::SeventvEmote;
+        if (emote.value()->zeroWidth)
+        {
+            flags.set(MessageElementFlag::ZeroWidthEmote);
+        }
     }
     else if ((emote = globalFfzEmotes.emote(name)))
     {