Merge c66b8853a1 into 18c4815ad7

Bumps [lib/expected-lite](https://github.com/martinmoene/expected-lite) from `88ee08e` to `5b5caad`.
- [Release notes](https://github.com/martinmoene/expected-lite/releases)
- [Commits](88ee08eb3c...5b5caad7cd)

---
updated-dependencies:
- dependency-name: lib/expected-lite
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

CHANGELOG.md

@@ -7,7 +7,7 @@
 - Major: Improve high-DPI support on Windows. (#4868, #5391, #5664, #5666)
 - Major: Added transparent overlay window (default keybind: <kbd>CTRL</kbd> + <kbd>ALT</kbd> + <kbd>N</kbd>). (#4746, #5643, #5659)
 - Minor: Removed the Ctrl+Shift+L hotkey for toggling the "live only" tab visibility state. (#5530)
-- Minor: Add support for Shared Chat messages. Shared chat messages can be filtered with the `flags.shared` filter variable, or with search using `is:shared`. Some messages like subscriptions are filtered on purpose to avoid confusion for the broadcaster. If you have both channels participating in Shared Chat open, only one of the message triggering your highlight will trigger. (#5606, #5625)
+- Minor: Add support for Shared Chat messages. Shared chat messages can be filtered with the `flags.shared` filter variable, or with search using `is:shared`. Some messages like subscriptions are filtered on purpose to avoid confusion for the broadcaster. If you have both channels participating in Shared Chat open, only one of the message triggering your highlight will trigger. (#5606, #5625, #5661)
 - Minor: Moved tab visibility control to a submenu, without any toggle actions. (#5530)
 - Minor: Add option to customise Moderation buttons with images. (#5369)
 - Minor: Colored usernames now update on the fly when changing the "Color @usernames" setting. (#5300)

lib/expected-lite

@@ -1 +1 @@
-Subproject commit 88ee08eb3c3f3627ca54b90dafd1d63a6d4da96b
+Subproject commit 5b5caad7cd57d5ba3ca796bf1521b131d73ca405

mocks/include/mocks/BaseApplication.hpp

@@ -3,6 +3,7 @@
 #include "common/Args.hpp"
 #include "mocks/DisabledStreamerMode.hpp"
 #include "mocks/EmptyApplication.hpp"
+#include "mocks/TwitchUsers.hpp"
 #include "providers/bttv/BttvLiveUpdates.hpp"
 #include "singletons/Fonts.hpp"
 #include "singletons/Settings.hpp"
@@ -55,6 +56,11 @@ public:
         return &this->fonts;
     }
 
+    ITwitchUsers *getTwitchUsers() override
+    {
+        return &this->twitchUsers;
+    }
+
     BttvLiveUpdates *getBttvLiveUpdates() override
     {
         return nullptr;
@@ -71,6 +77,7 @@ public:
     DisabledStreamerMode streamerMode;
     Theme theme;
     Fonts fonts;
+    TwitchUsers twitchUsers;
 };
 
 }  // namespace chatterino::mock

mocks/include/mocks/TwitchUsers.hpp

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "providers/twitch/TwitchUser.hpp"
+#include "providers/twitch/TwitchUsers.hpp"
+
+namespace chatterino::mock {
+
+class TwitchUsers : public ITwitchUsers
+{
+public:
+    TwitchUsers() = default;
+
+    std::shared_ptr<TwitchUser> resolveID(const UserId &id)
+    {
+        TwitchUser u = {
+            .id = id.string,
+            .name = {},
+            .displayName = {},
+        };
+        return std::make_shared<TwitchUser>(u);
+    }
+};
+
+}  // namespace chatterino::mock

src/messages/MessageBuilder.cpp

@@ -32,6 +32,7 @@
 #include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/TwitchIrc.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
+#include "providers/twitch/TwitchUsers.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/Resources.hpp"
 #include "singletons/Settings.hpp"
@@ -380,6 +381,18 @@ EmotePtr makeAutoModBadge()
         Url{"https://dashboard.twitch.tv/settings/moderation/automod"}});
 }
 
+EmotePtr makeSharedChatBadge(const QString &sourceName)
+{
+    return std::make_shared<Emote>(Emote{
+        .name = EmoteName{},
+        .images = ImageSet{Image::fromResourcePixmap(
+            getResources().twitch.sharedChat, 0.25)},
+        .tooltip = Tooltip{"Shared Message" +
+                           (sourceName.isEmpty() ? "" : " from " + sourceName)},
+        .homePage = Url{"https://link.twitch.tv/SharedChatViewer"},
+    });
+}
+
 std::tuple<std::optional<EmotePtr>, MessageElementFlags, bool> parseEmote(
     TwitchChannel *twitchChannel, const EmoteName &name)
 {
@@ -2751,6 +2764,28 @@ void MessageBuilder::appendTwitchBadges(const QVariantMap &tags,
         return;
     }
 
+    if (this->message().flags.has(MessageFlag::SharedMessage))
+    {
+        const QString sourceId = tags["source-room-id"].toString();
+        QString sourceName;
+        if (sourceId.isEmpty())
+        {
+            sourceName = "";
+        }
+        else if (twitchChannel->roomId() == sourceId)
+        {
+            sourceName = twitchChannel->getName();
+        }
+        else
+        {
+            sourceName =
+                getApp()->getTwitchUsers()->resolveID({sourceId})->displayName;
+        }
+
+        this->emplace<BadgeElement>(makeSharedChatBadge(sourceName),
+                                    MessageElementFlag::BadgeSharedChannel);
+    }
+
     auto badgeInfos = parseBadgeInfoTag(tags);
     auto badges = parseBadgeTag(tags);
     appendBadges(this, badges, badgeInfos, twitchChannel);

src/messages/MessageElement.hpp

@@ -66,6 +66,10 @@ enum class MessageElementFlag : int64_t {
     BitsStatic = (1LL << 11),
     BitsAnimated = (1LL << 12),
 
+    // Slot 0: Twitch
+    // - Shared Channel indicator badge
+    BadgeSharedChannel = (1LL << 37),
+
     // Slot 1: Twitch
     // - Staff badge
     // - Admin badge
@@ -119,7 +123,7 @@ enum class MessageElementFlag : int64_t {
 
     Badges = BadgeGlobalAuthority | BadgePredictions | BadgeChannelAuthority |
              BadgeSubscription | BadgeVanity | BadgeChatterino | BadgeSevenTV |
-             BadgeFfz,
+             BadgeFfz | BadgeSharedChannel,
 
     ChannelName = (1LL << 20),
 

src/singletons/WindowManager.cpp

@@ -195,6 +195,7 @@ void WindowManager::updateWordTypeMask()
     flags.set(settings->animateEmotes ? MEF::BitsAnimated : MEF::BitsStatic);
 
     // badges
+    flags.set(MEF::BadgeSharedChannel);
     flags.set(settings->showBadgesGlobalAuthority ? MEF::BadgeGlobalAuthority
                                                   : MEF::None);
     flags.set(settings->showBadgesPredictions ? MEF::BadgePredictions

src/widgets/helper/ChannelView.cpp

@@ -2408,6 +2408,11 @@ void ChannelView::handleMouseClick(QMouseEvent *event,
                                 return;
                             }
 
+                            if (link.value.startsWith("id:"))
+                            {
+                                return;
+                            }
+
                             // Insert @username into split input
                             const bool commaMention =
                                 getSettings()->mentionUsersWithComma;

tests/snapshots/IrcMessageHandler/shared-chat-announcement.json

@@ -64,6 +64,24 @@
                     "trailingSpace": true,
                     "type": "TwitchModerationElement"
                 },
+                {
+                    "emote": {
+                        "homePage": "https://link.twitch.tv/SharedChatViewer",
+                        "images": {
+                            "1x": ""
+                        },
+                        "name": "",
+                        "tooltip": "Shared Message"
+                    },
+                    "flags": "BadgeSharedChannel",
+                    "link": {
+                        "type": "None",
+                        "value": ""
+                    },
+                    "tooltip": "Shared Message",
+                    "trailingSpace": true,
+                    "type": "BadgeElement"
+                },
                 {
                     "emote": {
                         "homePage": "https://www.twitch.tv/jobs?ref=chat_badge",

tests/snapshots/IrcMessageHandler/shared-chat-emotes.json

@@ -64,6 +64,24 @@
                     "trailingSpace": true,
                     "type": "TwitchModerationElement"
                 },
+                {
+                    "emote": {
+                        "homePage": "https://link.twitch.tv/SharedChatViewer",
+                        "images": {
+                            "1x": ""
+                        },
+                        "name": "",
+                        "tooltip": "Shared Message from twitchdev"
+                    },
+                    "flags": "BadgeSharedChannel",
+                    "link": {
+                        "type": "None",
+                        "value": ""
+                    },
+                    "tooltip": "Shared Message from twitchdev",
+                    "trailingSpace": true,
+                    "type": "BadgeElement"
+                },
                 {
                     "color": "#ffff0000",
                     "flags": "Username",

tests/snapshots/IrcMessageHandler/shared-chat-known.json

@@ -64,6 +64,24 @@
                     "trailingSpace": true,
                     "type": "TwitchModerationElement"
                 },
+                {
+                    "emote": {
+                        "homePage": "https://link.twitch.tv/SharedChatViewer",
+                        "images": {
+                            "1x": ""
+                        },
+                        "name": "",
+                        "tooltip": "Shared Message from twitchdev"
+                    },
+                    "flags": "BadgeSharedChannel",
+                    "link": {
+                        "type": "None",
+                        "value": ""
+                    },
+                    "tooltip": "Shared Message from twitchdev",
+                    "trailingSpace": true,
+                    "type": "BadgeElement"
+                },
                 {
                     "emote": {
                         "homePage": "https://www.twitch.tv/jobs?ref=chat_badge",

tests/snapshots/IrcMessageHandler/shared-chat-unknown.json

@@ -64,6 +64,24 @@
                     "trailingSpace": true,
                     "type": "TwitchModerationElement"
                 },
+                {
+                    "emote": {
+                        "homePage": "https://link.twitch.tv/SharedChatViewer",
+                        "images": {
+                            "1x": ""
+                        },
+                        "name": "",
+                        "tooltip": "Shared Message"
+                    },
+                    "flags": "BadgeSharedChannel",
+                    "link": {
+                        "type": "None",
+                        "value": ""
+                    },
+                    "tooltip": "Shared Message",
+                    "trailingSpace": true,
+                    "type": "BadgeElement"
+                },
                 {
                     "emote": {
                         "homePage": "https://www.twitch.tv/jobs?ref=chat_badge",