Merge 64ccef94d1 into 867e3f3ab0

src/messages/MessageBuilder.cpp

@@ -2759,7 +2759,7 @@ void MessageBuilder::appendTwitchBadges(const QVariantMap &tags,
 
     if (this->message().flags.has(MessageFlag::SharedMessage))
     {
-        const QString sourceId = tags["source-room-id"].toString();
+        QString sourceId = tags["source-room-id"].toString();
         std::optional<QString> sourceName;
         if (twitchChannel->roomId() == sourceId)
         {
@@ -2773,14 +2773,9 @@ void MessageBuilder::appendTwitchBadges(const QVariantMap &tags,
 
         if (sourceName.has_value())
         {
-            const auto &name = sourceName.value();
+            this->emplace<BadgeElement>(makeSharedChatBadge(sourceName.value()),
-            auto *badge = this->emplace<BadgeElement>(
+                                        MessageElementFlag::BadgeSharedChannel)
-                makeSharedChatBadge(name),
+                ->setLink({Link::UserInfo, sourceName.value()});
-                MessageElementFlag::BadgeSharedChannel);
-            if (!name.isEmpty())
-            {
-                badge->setLink({Link::UserInfo, name});
-            }
         }
     }
 

src/providers/twitch/TwitchIrcServer.hpp

@@ -100,11 +100,6 @@ public:
     std::shared_ptr<Channel> getChannelOrEmptyByID(
         const QString &channelID) override;
 
-    /**
-     * Obtains the channel login name associated with the passed ID,
-     * so that Shared Chat messages can provide source channel context.
-     * Can yield an empty string if a helix request is already in-flight.
-     */
     std::optional<QString> getOrPopulateChannelCache(
         const QString &channelId) override;