Fixed restricted users' usernames not being clickable

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Minor: Colored usernames now update on the fly when changing the "Color @usernames" setting. (#5300)
 - Minor: Added `flags.action` filter variable, allowing you to filter on `/me` messages. (#5397)
 - Bugfix: If a network request errors with 200 OK, Qt's error code is now reported instead of the HTTP status. (#5378)
+- Bugfix: Fixed restricted users usernames not being clickable. (#5405)
 - Dev: Use Qt's high DPI scaling. (#4868, #5400)
 - Dev: Add doxygen build target. (#5377)
 - Dev: Make printing of strings in tests easier. (#5379)

src/messages/MessageBuilder.cpp

@@ -763,7 +763,7 @@ void MessageBuilder::addTextOrEmoji(const QString &string_)
     auto &&textColor = this->textColor_;
     if (string.startsWith('@'))
     {
-        this->emplace<MentionElement>(string, textColor, textColor);
+        this->emplace<MentionElement>(string, "", textColor, textColor);
     }
     else
     {

src/messages/MessageElement.cpp

@@ -703,11 +703,14 @@ Link LinkElement::getLink() const
     return {Link::Url, this->linkInfo_.url()};
 }
 
-MentionElement::MentionElement(const QString &name, MessageColor fallbackColor_,
+MentionElement::MentionElement(const QString &displayName, QString loginName_,
+                               MessageColor fallbackColor_,
                                MessageColor userColor_)
-    : TextElement(name, {MessageElementFlag::Text, MessageElementFlag::Mention})
+    : TextElement(displayName,
+                  {MessageElementFlag::Text, MessageElementFlag::Mention})
     , fallbackColor(fallbackColor_)
     , userColor(userColor_)
+    , userLoginName(std::move(loginName_))
 {
 }
 
@@ -735,6 +738,26 @@ void MentionElement::addToContainer(MessageLayoutContainer &container,
     TextElement::addToContainer(container, flags);
 }
 
+MessageElement *MentionElement::setLink(const Link &link)
+{
+    assert(false && "MentionElement::setLink should not be called. Pass "
+                    "through a valid login name in the constructor and it will "
+                    "automatically be a UserInfo link");
+
+    return TextElement::setLink(link);
+}
+
+Link MentionElement::getLink() const
+{
+    if (this->userLoginName.isEmpty())
+    {
+        // Some rare mention elements don't have the knowledge of the login name
+        return {};
+    }
+
+    return {Link::UserInfo, this->userLoginName};
+}
+
 // TIMESTAMP
 TimestampElement::TimestampElement(QTime time)
     : MessageElement(MessageElementFlag::Timestamp)

src/messages/MessageElement.hpp

@@ -169,7 +169,7 @@ class MessageElement
     MessageElement(MessageElement &&) = delete;
     MessageElement &operator=(MessageElement &&) = delete;
 
-    MessageElement *setLink(const Link &link);
+    virtual MessageElement *setLink(const Link &link);
     MessageElement *setTooltip(const QString &tooltip);
 
     MessageElement *setTrailingSpace(bool value);
@@ -314,8 +314,8 @@ class LinkElement : public TextElement
 class MentionElement : public TextElement
 {
 public:
-    MentionElement(const QString &name, MessageColor fallbackColor_,
-                   MessageColor userColor_);
+    MentionElement(const QString &displayName, QString loginName_,
+                   MessageColor fallbackColor_, MessageColor userColor_);
     ~MentionElement() override = default;
     MentionElement(const MentionElement &) = delete;
     MentionElement(MentionElement &&) = delete;
@@ -325,6 +325,9 @@ class MentionElement : public TextElement
     void addToContainer(MessageLayoutContainer &container,
                         MessageElementFlags flags) override;
 
+    MessageElement *setLink(const Link &link) override;
+    Link getLink() const override;
+
 private:
     /**
      * The color of the element in case the "Colorize @usernames" is disabled
@@ -335,6 +338,8 @@ class MentionElement : public TextElement
      * The color of the element in case the "Colorize @usernames" is enabled
      **/
     MessageColor userColor;
+
+    QString userLoginName;
 };
 
 // contains emote data and will pick the emote based on :

src/providers/twitch/TwitchMessageBuilder.cpp

@@ -770,9 +770,8 @@ void TwitchMessageBuilder::addTextOrEmoji(const QString &string_)
 
             auto prefixedUsername = '@' + username;
             auto remainder = string.remove(prefixedUsername);
-            this->emplace<MentionElement>(prefixedUsername, originalTextColor,
-                                          textColor)
-                ->setLink({Link::UserInfo, username})
+            this->emplace<MentionElement>(prefixedUsername, username,
+                                          originalTextColor, textColor)
                 ->setTrailingSpace(remainder.isEmpty());
 
             if (!remainder.isEmpty())
@@ -802,9 +801,8 @@ void TwitchMessageBuilder::addTextOrEmoji(const QString &string_)
             }
 
             auto remainder = string.remove(username);
-            this->emplace<MentionElement>(username, originalTextColor,
+            this->emplace<MentionElement>(username, username, originalTextColor,
                                           textColor)
-                ->setLink({Link::UserInfo, username})
                 ->setTrailingSpace(remainder.isEmpty());
 
             if (!remainder.isEmpty())
@@ -1821,8 +1819,10 @@ void TwitchMessageBuilder::listOfUsersSystemMessage(QString prefix,
             }
         }
 
-        builder->emplace<MentionElement>(username, MessageColor::System, color)
-            ->setLink({Link::UserInfo, username})
+        // TODO: Ensure we make use of display name / username(login name) correctly here
+        builder
+            ->emplace<MentionElement>(username, username, MessageColor::System,
+                                      color)
             ->setTrailingSpace(false);
     }
 }
@@ -1867,9 +1867,8 @@ void TwitchMessageBuilder::listOfUsersSystemMessage(
         }
 
         builder
-            ->emplace<MentionElement>(user.userName, MessageColor::System,
-                                      color)
-            ->setLink({Link::UserInfo, user.userLogin})
+            ->emplace<MentionElement>(user.userName, user.userLogin,
+                                      MessageColor::System, color)
             ->setTrailingSpace(false);
     }
 
@@ -1938,8 +1937,8 @@ MessagePtr TwitchMessageBuilder::makeAutomodInfoMessage(
     builder.emplace<BadgeElement>(makeAutoModBadge(),
                                   MessageElementFlag::BadgeChannelAuthority);
     // AutoMod "username"
-    builder.emplace<MentionElement>("AutoMod:", AUTOMOD_USER_COLOR,
-                                    AUTOMOD_USER_COLOR);
+    builder.emplace<TextElement>("AutoMod:", MessageElementFlag::Text,
+                                 AUTOMOD_USER_COLOR, FontStyle::ChatMediumBold);
     switch (action.type)
     {
         case AutomodInfoAction::OnHold: {
@@ -1993,8 +1992,9 @@ std::pair<MessagePtr, MessagePtr> TwitchMessageBuilder::makeAutomodMessage(
     builder.emplace<BadgeElement>(makeAutoModBadge(),
                                   MessageElementFlag::BadgeChannelAuthority);
     // AutoMod "username"
-    builder2.emplace<MentionElement>("AutoMod:", AUTOMOD_USER_COLOR,
-                                     AUTOMOD_USER_COLOR);
+    builder2.emplace<TextElement>("AutoMod:", MessageElementFlag::Text,
+                                  AUTOMOD_USER_COLOR,
+                                  FontStyle::ChatMediumBold);
     // AutoMod header message
     builder.emplace<TextElement>(
         ("Held a message for reason: " + action.reason +
@@ -2041,10 +2041,9 @@ std::pair<MessagePtr, MessagePtr> TwitchMessageBuilder::makeAutomodMessage(
     builder2.message().flags.set(MessageFlag::AutoModOffendingMessage);
 
     // sender username
-    builder2
-        .emplace<MentionElement>(action.target.displayName + ":",
-                                 MessageColor::Text, action.target.color)
-        ->setLink({Link::UserInfo, action.target.login});
+    builder2.emplace<MentionElement>(action.target.displayName + ":",
+                                     action.target.login, MessageColor::Text,
+                                     action.target.color);
     // sender's message caught by AutoMod
     builder2.emplace<TextElement>(action.message, MessageElementFlag::Text,
                                   MessageColor::Text);
@@ -2239,9 +2238,9 @@ std::pair<MessagePtr, MessagePtr> TwitchMessageBuilder::makeLowTrustUserMessage(
     appendBadges(&builder2, action.senderBadges, {}, twitchChannel);
 
     // sender username
-    builder2.emplace<MentionElement>(action.suspiciousUserDisplayName + ":",
-                                     MessageColor::Text,
-                                     action.suspiciousUserColor);
+    builder2.emplace<MentionElement>(
+        action.suspiciousUserDisplayName + ":", action.suspiciousUserLogin,
+        MessageColor::Text, action.suspiciousUserColor);
 
     // sender's message caught by AutoMod
     for (const auto &fragment : action.fragments)