CHANGELOG.md

@@ -34,12 +34,10 @@
 - Minor: Moderators can now see which mods start and cancel raids. (#5563)
 - Minor: The emote popup now reloads when Twitch emotes are reloaded. (#5580)
 - Minor: Added `--login <username>` CLI argument to specify which account to start logged in as. (#5626)
-- Minor: When blocking a channel, Chatterino will now warn you about that action. (#5615)
 - Minor: Indicate when subscriptions and resubscriptions are for multiple months. (#5642)
 - Minor: Proxy URL information is now included in the `/debug-env` command. (#5648)
 - Minor: Make raid entry message usernames clickable. (#5651)
 - Minor: Tabs unhighlight when their content is read in other tabs. (#5649)
-- Minor: Made usernames in bits and sub messages clickable. (#5686)
 - Bugfix: Fixed tab move animation occasionally failing to start after closing a tab. (#5426, #5612)
 - 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)
@@ -57,7 +55,6 @@
 - Bugfix: Fixed event emotes not showing up in autocomplete and popups. (#5239, #5580, #5582, #5632)
 - Bugfix: Fixed tab visibility being controllable in the emote popup. (#5530)
 - Bugfix: Fixed account switch not being saved if no other settings were changed. (#5558)
-- Bugfix: Fixed a crash that could occur when handling the quick switcher popup really quickly. (#5687)
 - Bugfix: Fixed 7TV badges being inadvertently animated. (#5674)
 - Bugfix: Fixed some tooltips not being readable. (#5578)
 - Bugfix: Fixed log files being locked longer than needed. (#5592)

mocks/include/mocks/Helix.hpp

@@ -422,7 +422,7 @@ public:
     // get followed channel
     MOCK_METHOD(
         void, getFollowedChannel,
-        (QString userID, QString broadcasterID, const QObject *caller,
+        (QString userID, QString broadcasterID,
          ResultCallback<std::optional<HelixFollowedChannel>> successCallback,
          FailureCallback<QString> failureCallback),
         (override));

src/messages/MessageBuilder.cpp

@@ -75,8 +75,6 @@ const QRegularExpression mentionRegex("^@" + regexHelpString);
 // if findAllUsernames setting is enabled, matches strings like in the examples above, but without @ symbol at the beginning
 const QRegularExpression allUsernamesMentionRegex("^" + regexHelpString);
 
-const QRegularExpression SPACE_REGEX("\\s");
-
 const QSet<QString> zeroWidthEmotes{
     "SoSnowy",  "IceCold",   "SantaHat", "TopHat",
     "ReinDeer", "CandyCane", "cvMask",   "cvHazmat",
@@ -514,7 +512,7 @@ MessageBuilder::MessageBuilder(SystemMessageTag, const QString &text,
     // check system message for links
     // (e.g. needed for sub ticket message in sub only mode)
     const QStringList textFragments =
-        text.split(SPACE_REGEX, Qt::SkipEmptyParts);
+        text.split(QRegularExpression("\\s"), Qt::SkipEmptyParts);
     for (const auto &word : textFragments)
     {
         auto link = linkparser::parse(word);
@@ -533,100 +531,33 @@ MessageBuilder::MessageBuilder(SystemMessageTag, const QString &text,
     this->message().searchText = text;
 }
 
-MessagePtrMut MessageBuilder::makeSystemMessageWithUser(
-    const QString &text, const QString &loginName, const QString &displayName,
-    const MessageColor &userColor, const QTime &time)
+MessageBuilder::MessageBuilder(RaidEntryMessageTag, const QString &text,
+                               const QString &loginName,
+                               const QString &displayName,
+                               const MessageColor &userColor, const QTime &time)
+    : MessageBuilder()
 {
-    MessageBuilder builder;
-    builder.emplace<TimestampElement>(time);
+    this->emplace<TimestampElement>(time);
 
-    const auto textFragments = text.split(SPACE_REGEX, Qt::SkipEmptyParts);
+    const QStringList textFragments =
+        text.split(QRegularExpression("\\s"), Qt::SkipEmptyParts);
     for (const auto &word : textFragments)
     {
         if (word == displayName)
         {
-            builder.emplace<MentionElement>(displayName, loginName,
-                                            MessageColor::System, userColor);
+            this->emplace<MentionElement>(displayName, loginName,
+                                          MessageColor::System, userColor);
             continue;
         }
 
-        builder.emplace<TextElement>(word, MessageElementFlag::Text,
-                                     MessageColor::System);
+        this->emplace<TextElement>(word, MessageElementFlag::Text,
+                                   MessageColor::System);
     }
 
-    builder->flags.set(MessageFlag::System);
-    builder->flags.set(MessageFlag::DoNotTriggerNotification);
-    builder->messageText = text;
-    builder->searchText = text;
-
-    return builder.release();
-}
-
-MessagePtrMut MessageBuilder::makeSubgiftMessage(const QString &text,
-                                                 const QVariantMap &tags,
-                                                 const QTime &time)
-{
-    MessageBuilder builder;
-    builder.emplace<TimestampElement>(time);
-
-    auto gifterLogin = tags.value("login").toString();
-    auto gifterDisplayName = tags.value("display-name").toString();
-    if (gifterDisplayName.isEmpty())
-    {
-        gifterDisplayName = gifterLogin;
-    }
-    MessageColor gifterColor = MessageColor::System;
-    if (auto colorTag = tags.value("color").value<QColor>(); colorTag.isValid())
-    {
-        gifterColor = MessageColor(colorTag);
-    }
-
-    auto recipientLogin =
-        tags.value("msg-param-recipient-user-name").toString();
-    if (recipientLogin.isEmpty())
-    {
-        recipientLogin = tags.value("msg-param-recipient-name").toString();
-    }
-    auto recipientDisplayName =
-        tags.value("msg-param-recipient-display-name").toString();
-    if (recipientDisplayName.isEmpty())
-    {
-        recipientDisplayName = recipientLogin;
-    }
-
-    const auto textFragments = text.split(SPACE_REGEX, Qt::SkipEmptyParts);
-    for (const auto &word : textFragments)
-    {
-        if (word == gifterDisplayName)
-        {
-            builder.emplace<MentionElement>(gifterDisplayName, gifterLogin,
-                                            MessageColor::System, gifterColor);
-            continue;
-        }
-        if (word.endsWith('!') &&
-            word.size() == recipientDisplayName.size() + 1 &&
-            word.startsWith(recipientDisplayName))
-        {
-            builder
-                .emplace<MentionElement>(recipientDisplayName, recipientLogin,
-                                         MessageColor::System,
-                                         MessageColor::System)
-                ->setTrailingSpace(false);
-            builder.emplace<TextElement>(u"!"_s, MessageElementFlag::Text,
-                                         MessageColor::System);
-            continue;
-        }
-
-        builder.emplace<TextElement>(word, MessageElementFlag::Text,
-                                     MessageColor::System);
-    }
-
-    builder->flags.set(MessageFlag::System);
-    builder->flags.set(MessageFlag::DoNotTriggerNotification);
-    builder->messageText = text;
-    builder->searchText = text;
-
-    return builder.release();
+    this->message().flags.set(MessageFlag::System);
+    this->message().flags.set(MessageFlag::DoNotTriggerNotification);
+    this->message().messageText = text;
+    this->message().searchText = text;
 }
 
 MessageBuilder::MessageBuilder(TimeoutMessageTag, const QString &timeoutUser,

src/messages/MessageBuilder.hpp

@@ -52,6 +52,8 @@ namespace linkparser {
 
 struct SystemMessageTag {
 };
+struct RaidEntryMessageTag {
+};
 struct TimeoutMessageTag {
 };
 struct LiveUpdatesUpdateEmoteMessageTag {
@@ -67,6 +69,7 @@ struct ImageUploaderResultTag {
 
 // NOLINTBEGIN(readability-identifier-naming)
 const SystemMessageTag systemMessage{};
+const RaidEntryMessageTag raidEntryMessage{};
 const TimeoutMessageTag timeoutMessage{};
 const LiveUpdatesUpdateEmoteMessageTag liveUpdatesUpdateEmoteMessage{};
 const LiveUpdatesRemoveEmoteMessageTag liveUpdatesRemoveEmoteMessage{};
@@ -106,6 +109,9 @@ public:
 
     MessageBuilder(SystemMessageTag, const QString &text,
                    const QTime &time = QTime::currentTime());
+    MessageBuilder(RaidEntryMessageTag, const QString &text,
+                   const QString &loginName, const QString &displayName,
+                   const MessageColor &userColor, const QTime &time);
     MessageBuilder(TimeoutMessageTag, const QString &timeoutUser,
                    const QString &sourceUser, const QString &systemMessageText,
                    int times, const QTime &time = QTime::currentTime());
@@ -249,15 +255,6 @@ public:
         const std::shared_ptr<MessageThread> &thread = {},
         const MessagePtr &parent = {});
 
-    static MessagePtrMut makeSystemMessageWithUser(
-        const QString &text, const QString &loginName,
-        const QString &displayName, const MessageColor &userColor,
-        const QTime &time);
-
-    static MessagePtrMut makeSubgiftMessage(const QString &text,
-                                            const QVariantMap &tags,
-                                            const QTime &time);
-
 private:
     struct TextState {
         TwitchChannel *twitchChannel = nullptr;

src/providers/twitch/IrcMessageHandler.cpp

@@ -699,6 +699,35 @@ void IrcMessageHandler::parseUserNoticeMessageInto(Communi::IrcMessage *message,
         {
             messageText = "Announcement";
         }
+        else if (msgType == "raid")
+        {
+            auto login = tags.value("login").toString();
+            auto displayName = tags.value("msg-param-displayName").toString();
+
+            if (!login.isEmpty() && !displayName.isEmpty())
+            {
+                MessageColor color = MessageColor::System;
+                if (auto colorTag = tags.value("color").value<QColor>();
+                    colorTag.isValid())
+                {
+                    color = MessageColor(colorTag);
+                }
+
+                auto b = MessageBuilder(
+                    raidEntryMessage, parseTagString(messageText), login,
+                    displayName, color, calculateMessageTime(message).time());
+
+                b->flags.set(MessageFlag::Subscription);
+                if (mirrored)
+                {
+                    b->flags.set(MessageFlag::SharedMessage);
+                }
+                auto newMessage = b.release();
+
+                sink.addMessage(newMessage, MessageContext::Original);
+                return;
+            }
+        }
         else if (msgType == "subgift")
         {
             if (auto monthsIt = tags.find("msg-param-gift-months");
@@ -733,20 +762,6 @@ void IrcMessageHandler::parseUserNoticeMessageInto(Communi::IrcMessage *message,
                     }
                 }
             }
-
-            // subgifts are special because they include two users
-            auto msg = MessageBuilder::makeSubgiftMessage(
-                parseTagString(messageText), tags,
-                calculateMessageTime(message).time());
-
-            msg->flags.set(MessageFlag::Subscription);
-            if (mirrored)
-            {
-                msg->flags.set(MessageFlag::SharedMessage);
-            }
-
-            sink.addMessage(msg, MessageContext::Original);
-            return;
         }
         else if (msgType == "sub" || msgType == "resub")
         {
@@ -780,37 +795,17 @@ void IrcMessageHandler::parseUserNoticeMessageInto(Communi::IrcMessage *message,
             }
         }
 
-        auto displayName = [&] {
-            if (msgType == u"raid")
-            {
-                return tags.value("msg-param-displayName").toString();
-            }
-            return tags.value("display-name").toString();
-        }();
-        auto login = tags.value("login").toString();
-        if (displayName.isEmpty())
-        {
-            displayName = login;
-        }
+        auto b = MessageBuilder(systemMessage, parseTagString(messageText),
+                                calculateMessageTime(message).time());
 
-        MessageColor userColor = MessageColor::System;
-        if (auto colorTag = tags.value("color").value<QColor>();
-            colorTag.isValid())
-        {
-            userColor = MessageColor(colorTag);
-        }
-
-        auto msg = MessageBuilder::makeSystemMessageWithUser(
-            parseTagString(messageText), login, displayName, userColor,
-            calculateMessageTime(message).time());
-
-        msg->flags.set(MessageFlag::Subscription);
+        b->flags.set(MessageFlag::Subscription);
         if (mirrored)
         {
-            msg->flags.set(MessageFlag::SharedMessage);
+            b->flags.set(MessageFlag::SharedMessage);
         }
+        auto newMessage = b.release();
 
-        sink.addMessage(msg, MessageContext::Original);
+        sink.addMessage(newMessage, MessageContext::Original);
     }
 }
 

src/providers/twitch/TwitchChannel.cpp

@@ -274,7 +274,7 @@ void TwitchChannel::refreshTwitchChannelEmotes(bool manualRefresh)
 
     getHelix()->getFollowedChannel(
         getApp()->getAccounts()->twitch.getCurrent()->getUserId(),
-        this->roomId(), nullptr,
+        this->roomId(),
         [weak{this->weak_from_this()}, makeEmotes](const auto &chan) {
             auto self = std::dynamic_pointer_cast<TwitchChannel>(weak.lock());
             if (!self || !chan)

src/providers/twitch/api/Helix.cpp

@@ -3138,7 +3138,7 @@ void Helix::getUserEmotes(
 }
 
 void Helix::getFollowedChannel(
-    QString userID, QString broadcasterID, const QObject *caller,
+    QString userID, QString broadcasterID,
     ResultCallback<std::optional<HelixFollowedChannel>> successCallback,
     FailureCallback<QString> failureCallback)
 {
@@ -3147,7 +3147,6 @@ void Helix::getFollowedChannel(
                       {u"user_id"_s, userID},
                       {u"broadcaster_id"_s, broadcasterID},
                   })
-        .caller(caller)
         .onSuccess([successCallback](auto result) {
             if (result.status() != 200)
             {

src/providers/twitch/api/Helix.hpp

@@ -1143,7 +1143,7 @@ public:
     /// https://dev.twitch.tv/docs/api/reference/#get-followed-channels
     /// (non paginated)
     virtual void getFollowedChannel(
-        QString userID, QString broadcasterID, const QObject *caller,
+        QString userID, QString broadcasterID,
         ResultCallback<std::optional<HelixFollowedChannel>> successCallback,
         FailureCallback<QString> failureCallback) = 0;
 
@@ -1486,7 +1486,7 @@ public:
     /// https://dev.twitch.tv/docs/api/reference/#get-followed-channels
     /// (non paginated)
     void getFollowedChannel(
-        QString userID, QString broadcasterID, const QObject *caller,
+        QString userID, QString broadcasterID,
         ResultCallback<std::optional<HelixFollowedChannel>> successCallback,
         FailureCallback<QString> failureCallback) final;
 

src/widgets/DraggablePopup.cpp

@@ -41,7 +41,6 @@ DraggablePopup::DraggablePopup(bool closeAutomatically, QWidget *parent)
               BaseWindow::ClearBuffersOnDpiChange,
           parent)
     , lifetimeHack_(std::make_shared<bool>(false))
-    , closeAutomatically_(closeAutomatically)
     , dragTimer_(this)
 
 {
@@ -129,14 +128,4 @@ Button *DraggablePopup::createPinButton()
     return this->pinButton_;
 }
 
-bool DraggablePopup::ensurePinned()
-{
-    if (this->closeAutomatically_ && !this->isPinned_)
-    {
-        this->togglePinned();
-        return true;
-    }
-    return false;
-}
-
 }  // namespace chatterino

src/widgets/DraggablePopup.hpp

@@ -38,18 +38,10 @@ protected:
     // button pixmap
     void togglePinned();
 
-    /// Ensures that this popup is pinned (if it's expected to close automatically)
-    ///
-    /// @returns `true` if the popup was pinned as a result (i.e. if the popup
-    ///          was unpinned and said to automatically close before)
-    bool ensurePinned();
-
 private:
     // isMoving_ is set to true if the user is holding the left mouse button down and has moved the mouse a small amount away from the original click point (startPosDrag_)
     bool isMoving_ = false;
 
-    bool closeAutomatically_ = false;
-
     // startPosDrag_ is the coordinates where the user originally pressed the mouse button down to start dragging
     QPoint startPosDrag_;
 

src/widgets/dialogs/UserInfoPopup.cpp

@@ -2,7 +2,6 @@
 
 #include "Application.hpp"
 #include "common/Channel.hpp"
-#include "common/Literals.hpp"
 #include "common/network/NetworkRequest.hpp"
 #include "common/QLogging.hpp"
 #include "controllers/accounts/AccountController.hpp"
@@ -38,8 +37,6 @@
 
 #include <QCheckBox>
 #include <QDesktopServices>
-#include <QMessageBox>
-#include <QMetaEnum>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QPointer>
@@ -144,8 +141,6 @@ int calculateTimeoutDuration(TimeoutButton timeout)
 
 namespace chatterino {
 
-using namespace literals;
-
 UserInfoPopup::UserInfoPopup(bool closeAutomatically, Split *split)
     : DraggablePopup(closeAutomatically, split)
     , split_(split)
@@ -628,72 +623,57 @@ void UserInfoPopup::installEvents()
                 return;
             }
 
-            if (newState == Qt::Unchecked)
+            switch (newState)
             {
-                this->ui_.block->setEnabled(false);
+                case Qt::CheckState::Unchecked: {
+                    this->ui_.block->setEnabled(false);
 
-                getApp()->getAccounts()->twitch.getCurrent()->unblockUser(
-                    this->userId_, this,
-                    [this, reenableBlockCheckbox, currentUser] {
-                        this->channel_->addSystemMessage(
-                            QString("You successfully unblocked user %1")
-                                .arg(this->userName_));
-                        reenableBlockCheckbox();
-                    },
-                    [this, reenableBlockCheckbox] {
-                        this->channel_->addSystemMessage(
-                            QString("User %1 couldn't be unblocked, an unknown "
+                    getApp()->getAccounts()->twitch.getCurrent()->unblockUser(
+                        this->userId_, this,
+                        [this, reenableBlockCheckbox, currentUser] {
+                            this->channel_->addSystemMessage(
+                                QString("You successfully unblocked user %1")
+                                    .arg(this->userName_));
+                            reenableBlockCheckbox();
+                        },
+                        [this, reenableBlockCheckbox] {
+                            this->channel_->addSystemMessage(
+                                QString(
+                                    "User %1 couldn't be unblocked, an unknown "
                                     "error occurred!")
-                                .arg(this->userName_));
-                        reenableBlockCheckbox();
-                    });
-                return;
-            }
-
-            if (newState == Qt::Checked)
-            {
-                this->ui_.block->setEnabled(false);
-
-                bool wasPinned = this->ensurePinned();
-                auto btn = QMessageBox::warning(
-                    this, u"Blocking " % this->userName_,
-                    u"Blocking %1 can cause unintended side-effects like unfollowing.\n\n"_s
-                    "Are you sure you want to block %1?".arg(this->userName_),
-                    QMessageBox::Yes | QMessageBox::Cancel,
-                    QMessageBox::Cancel);
-                if (wasPinned)
-                {
-                    this->togglePinned();
+                                    .arg(this->userName_));
+                            reenableBlockCheckbox();
+                        });
                 }
-                if (btn != QMessageBox::Yes)
-                {
-                    reenableBlockCheckbox();
-                    QSignalBlocker blocker(this->ui_.block);
-                    this->ui_.block->setCheckState(Qt::Unchecked);
-                    return;
+                break;
+
+                case Qt::CheckState::PartiallyChecked: {
+                    // We deliberately ignore this state
                 }
+                break;
 
-                getApp()->getAccounts()->twitch.getCurrent()->blockUser(
-                    this->userId_, this,
-                    [this, reenableBlockCheckbox, currentUser] {
-                        this->channel_->addSystemMessage(
-                            QString("You successfully blocked user %1")
-                                .arg(this->userName_));
-                        reenableBlockCheckbox();
-                    },
-                    [this, reenableBlockCheckbox] {
-                        this->channel_->addSystemMessage(
-                            QString("User %1 couldn't be blocked, an "
-                                    "unknown error occurred!")
-                                .arg(this->userName_));
-                        reenableBlockCheckbox();
-                    });
-                return;
+                case Qt::CheckState::Checked: {
+                    this->ui_.block->setEnabled(false);
+
+                    getApp()->getAccounts()->twitch.getCurrent()->blockUser(
+                        this->userId_, this,
+                        [this, reenableBlockCheckbox, currentUser] {
+                            this->channel_->addSystemMessage(
+                                QString("You successfully blocked user %1")
+                                    .arg(this->userName_));
+                            reenableBlockCheckbox();
+                        },
+                        [this, reenableBlockCheckbox] {
+                            this->channel_->addSystemMessage(
+                                QString(
+                                    "User %1 couldn't be blocked, an unknown "
+                                    "error occurred!")
+                                    .arg(this->userName_));
+                            reenableBlockCheckbox();
+                        });
+                }
+                break;
             }
-
-            qCWarning(chatterinoWidget)
-                << "Unexpected check-state when blocking" << this->userName_
-                << QMetaEnum::fromType<Qt::CheckState>().valueToKey(newState);
         });
 
     // ignore highlights

src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp

@@ -141,7 +141,7 @@ void QuickSwitcherPopup::updateSuggestions(const QString &text)
      * Timeout interval 0 means the call will be delayed until all window events
      * have been processed (cf. https://doc.qt.io/qt-5/qtimer.html#interval-prop).
      */
-    QTimer::singleShot(0, this, [this] {
+    QTimer::singleShot(0, [this] {
         this->adjustSize();
     });
 }

tests/snapshots/IrcMessageHandler/bitsbadge.json

@@ -38,9 +38,8 @@
                     "type": "TimestampElement"
                 },
                 {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
+                    "color": "System",
+                    "flags": "Text",
                     "link": {
                         "type": "None",
                         "value": ""
@@ -48,9 +47,7 @@
                     "style": "ChatMedium",
                     "tooltip": "",
                     "trailingSpace": true,
-                    "type": "MentionElement",
-                    "userColor": "#ffff4500",
-                    "userLoginName": "whoopiix",
+                    "type": "TextElement",
                     "words": [
                         "whoopiix"
                     ]

tests/snapshots/IrcMessageHandler/sub-first-gift.json

@@ -38,9 +38,8 @@
                     "type": "TimestampElement"
                 },
                 {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
+                    "color": "System",
+                    "flags": "Text",
                     "link": {
                         "type": "None",
                         "value": ""
@@ -48,9 +47,7 @@
                     "style": "ChatMedium",
                     "tooltip": "",
                     "trailingSpace": true,
-                    "type": "MentionElement",
-                    "userColor": "#ff00ff7f",
-                    "userLoginName": "hyperbolicxd",
+                    "type": "TextElement",
                     "words": [
                         "hyperbolicxd"
                     ]
@@ -145,24 +142,6 @@
                         "to"
                     ]
                 },
-                {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
-                    "link": {
-                        "type": "None",
-                        "value": ""
-                    },
-                    "style": "ChatMedium",
-                    "tooltip": "",
-                    "trailingSpace": false,
-                    "type": "MentionElement",
-                    "userColor": "System",
-                    "userLoginName": "quote_if_nam",
-                    "words": [
-                        "quote_if_nam"
-                    ]
-                },
                 {
                     "color": "System",
                     "flags": "Text",
@@ -175,7 +154,7 @@
                     "trailingSpace": true,
                     "type": "TextElement",
                     "words": [
-                        "!"
+                        "quote_if_nam!"
                     ]
                 },
                 {

tests/snapshots/IrcMessageHandler/sub-first-time.json

@@ -38,9 +38,8 @@
                     "type": "TimestampElement"
                 },
                 {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
+                    "color": "System",
+                    "flags": "Text",
                     "link": {
                         "type": "None",
                         "value": ""
@@ -48,9 +47,7 @@
                     "style": "ChatMedium",
                     "tooltip": "",
                     "trailingSpace": true,
-                    "type": "MentionElement",
-                    "userColor": "#ff0000ff",
-                    "userLoginName": "byebyeheart",
+                    "type": "TextElement",
                     "words": [
                         "byebyeheart"
                     ]

tests/snapshots/IrcMessageHandler/sub-gift.json

@@ -38,9 +38,8 @@
                     "type": "TimestampElement"
                 },
                 {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
+                    "color": "System",
+                    "flags": "Text",
                     "link": {
                         "type": "None",
                         "value": ""
@@ -48,9 +47,7 @@
                     "style": "ChatMedium",
                     "tooltip": "",
                     "trailingSpace": true,
-                    "type": "MentionElement",
-                    "userColor": "#ff0000ff",
-                    "userLoginName": "tww2",
+                    "type": "TextElement",
                     "words": [
                         "TWW2"
                     ]
@@ -145,24 +142,6 @@
                         "to"
                     ]
                 },
-                {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
-                    "link": {
-                        "type": "None",
-                        "value": ""
-                    },
-                    "style": "ChatMedium",
-                    "tooltip": "",
-                    "trailingSpace": false,
-                    "type": "MentionElement",
-                    "userColor": "System",
-                    "userLoginName": "mr_woodchuck",
-                    "words": [
-                        "Mr_Woodchuck"
-                    ]
-                },
                 {
                     "color": "System",
                     "flags": "Text",
@@ -175,7 +154,7 @@
                     "trailingSpace": true,
                     "type": "TextElement",
                     "words": [
-                        "!"
+                        "Mr_Woodchuck!"
                     ]
                 }
             ],

tests/snapshots/IrcMessageHandler/sub-message.json

@@ -290,9 +290,8 @@
                     "type": "TimestampElement"
                 },
                 {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
+                    "color": "System",
+                    "flags": "Text",
                     "link": {
                         "type": "None",
                         "value": ""
@@ -300,9 +299,7 @@
                     "style": "ChatMedium",
                     "tooltip": "",
                     "trailingSpace": true,
-                    "type": "MentionElement",
-                    "userColor": "#ff008000",
-                    "userLoginName": "ronni",
+                    "type": "TextElement",
                     "words": [
                         "ronni"
                     ]

tests/snapshots/IrcMessageHandler/sub-multi-month-anon-gift.json

@@ -217,24 +217,6 @@
                         "to"
                     ]
                 },
-                {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
-                    "link": {
-                        "type": "None",
-                        "value": ""
-                    },
-                    "style": "ChatMedium",
-                    "tooltip": "",
-                    "trailingSpace": false,
-                    "type": "MentionElement",
-                    "userColor": "System",
-                    "userLoginName": "mohammadrezadh",
-                    "words": [
-                        "MohammadrezaDH"
-                    ]
-                },
                 {
                     "color": "System",
                     "flags": "Text",
@@ -247,7 +229,7 @@
                     "trailingSpace": true,
                     "type": "TextElement",
                     "words": [
-                        "!"
+                        "MohammadrezaDH!"
                     ]
                 }
             ],

tests/snapshots/IrcMessageHandler/sub-multi-month-gift-count.json

@@ -38,9 +38,8 @@
                     "type": "TimestampElement"
                 },
                 {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
+                    "color": "System",
+                    "flags": "Text",
                     "link": {
                         "type": "None",
                         "value": ""
@@ -48,9 +47,7 @@
                     "style": "ChatMedium",
                     "tooltip": "",
                     "trailingSpace": true,
-                    "type": "MentionElement",
-                    "userColor": "#ffff8ea3",
-                    "userLoginName": "inatsufn",
+                    "type": "TextElement",
                     "words": [
                         "iNatsuFN"
                     ]
@@ -190,24 +187,6 @@
                         "to"
                     ]
                 },
-                {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
-                    "link": {
-                        "type": "None",
-                        "value": ""
-                    },
-                    "style": "ChatMedium",
-                    "tooltip": "",
-                    "trailingSpace": false,
-                    "type": "MentionElement",
-                    "userColor": "System",
-                    "userLoginName": "kimmi_tm",
-                    "words": [
-                        "kimmi_tm"
-                    ]
-                },
                 {
                     "color": "System",
                     "flags": "Text",
@@ -220,7 +199,7 @@
                     "trailingSpace": true,
                     "type": "TextElement",
                     "words": [
-                        "!"
+                        "kimmi_tm!"
                     ]
                 },
                 {

tests/snapshots/IrcMessageHandler/sub-multi-month-gift.json

@@ -38,9 +38,8 @@
                     "type": "TimestampElement"
                 },
                 {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
+                    "color": "System",
+                    "flags": "Text",
                     "link": {
                         "type": "None",
                         "value": ""
@@ -48,9 +47,7 @@
                     "style": "ChatMedium",
                     "tooltip": "",
                     "trailingSpace": true,
-                    "type": "MentionElement",
-                    "userColor": "#ffeb078d",
-                    "userLoginName": "lucidfoxx",
+                    "type": "TextElement",
                     "words": [
                         "Lucidfoxx"
                     ]
@@ -190,24 +187,6 @@
                         "to"
                     ]
                 },
-                {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
-                    "link": {
-                        "type": "None",
-                        "value": ""
-                    },
-                    "style": "ChatMedium",
-                    "tooltip": "",
-                    "trailingSpace": false,
-                    "type": "MentionElement",
-                    "userColor": "System",
-                    "userLoginName": "ogprodigy",
-                    "words": [
-                        "OGprodigy"
-                    ]
-                },
                 {
                     "color": "System",
                     "flags": "Text",
@@ -220,7 +199,7 @@
                     "trailingSpace": true,
                     "type": "TextElement",
                     "words": [
-                        "!"
+                        "OGprodigy!"
                     ]
                 }
             ],

tests/snapshots/IrcMessageHandler/sub-multi-month-resub.json

@@ -38,9 +38,8 @@
                     "type": "TimestampElement"
                 },
                 {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
+                    "color": "System",
+                    "flags": "Text",
                     "link": {
                         "type": "None",
                         "value": ""
@@ -48,9 +47,7 @@
                     "style": "ChatMedium",
                     "tooltip": "",
                     "trailingSpace": true,
-                    "type": "MentionElement",
-                    "userColor": "#ff0000ff",
-                    "userLoginName": "calm__like_a_tom",
+                    "type": "TextElement",
                     "words": [
                         "calm__like_a_tom"
                     ]

tests/snapshots/IrcMessageHandler/sub-multi-month.json

@@ -38,9 +38,8 @@
                     "type": "TimestampElement"
                 },
                 {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
+                    "color": "System",
+                    "flags": "Text",
                     "link": {
                         "type": "None",
                         "value": ""
@@ -48,9 +47,7 @@
                     "style": "ChatMedium",
                     "tooltip": "",
                     "trailingSpace": true,
-                    "type": "MentionElement",
-                    "userColor": "System",
-                    "userLoginName": "foly__",
+                    "type": "TextElement",
                     "words": [
                         "foly__"
                     ]

tests/snapshots/IrcMessageHandler/sub-no-message.json

@@ -38,9 +38,8 @@
                     "type": "TimestampElement"
                 },
                 {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
+                    "color": "System",
+                    "flags": "Text",
                     "link": {
                         "type": "None",
                         "value": ""
@@ -48,9 +47,7 @@
                     "style": "ChatMedium",
                     "tooltip": "",
                     "trailingSpace": true,
-                    "type": "MentionElement",
-                    "userColor": "#ffcc00c2",
-                    "userLoginName": "cspice",
+                    "type": "TextElement",
                     "words": [
                         "cspice"
                     ]
@@ -161,9 +158,8 @@
                     ]
                 },
                 {
-                    "color": "Text",
-                    "fallbackColor": "System",
-                    "flags": "Text|Mention",
+                    "color": "System",
+                    "flags": "Text",
                     "link": {
                         "type": "None",
                         "value": ""
@@ -171,9 +167,7 @@
                     "style": "ChatMedium",
                     "tooltip": "",
                     "trailingSpace": true,
-                    "type": "MentionElement",
-                    "userColor": "#ffcc00c2",
-                    "userLoginName": "cspice",
+                    "type": "TextElement",
                     "words": [
                         "cspice"
                     ]