Fixed the first link being broken in /mods and /vips (#3349)

Co-authored-by: Felanbird <41973452+Felanbird@users.noreply.github.com> Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
Chatterino · Nov 13, 2021 · 6b3a420 · 6b3a420
1 parent 85f6795
commit 6b3a420
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,7 @@
 - Bugfix: Fixed the reconnection backoff accidentally resetting when thrown out of certain IRC servers. (#3328)
 - Bugfix: Fixed underlying text from disabled emotes not being colorized properly. (#3333)
 - Bugfix: Fixed IRC ACTION messages (/me) not being colorized properly. (#3341)
+- Bugfix: Fixed the first usercard being broken in `/mods` and `/vips` (#3349)
 - Dev: Add GitHub action to test builds without precompiled headers enabled. (#3327)
 - Dev: Renamed CMake's build option `USE_SYSTEM_QT5KEYCHAIN` to `USE_SYSTEM_QTKEYCHAIN`. (#3103)
 - Dev: Add benchmarks that can be compiled with the `BUILD_BENCHMARKS` CMake flag. Off by default. (#3038)

diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp
@@ -855,8 +855,11 @@ void IrcMessageHandler::handleNoticeMessage(Communi::IrcNoticeMessage *message)
                    "IrcMessageHandler::handleNoticeMessage. Twitch specific "
                    "functionality called in non twitch channel");
 
-            TwitchMessageBuilder::modsOrVipsSystemMessage(
-                msgParts.at(0), msgParts.at(1).split(", "), tc, &builder);
+            auto users = msgParts.at(1)
+                             .mid(1)  // there is a space before the first user
+                             .split(", ");
+            TwitchMessageBuilder::modsOrVipsSystemMessage(msgParts.at(0), users,
+                                                          tc, &builder);
             channel->addMessage(builder.release());
         }
         else