refactor: make a single MessageBuilder (#5548)

src/common/ChannelChatters.cpp

@@ -3,7 +3,6 @@
 #include "common/Channel.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
-#include "providers/twitch/TwitchMessageBuilder.hpp"
 
 #include <QColor>
 
@@ -39,12 +38,11 @@ void ChannelChatters::addJoinedUser(const QString &user)
             auto joinedUsers = this->joinedUsers_.access();
             joinedUsers->sort();
 
-            MessageBuilder builder;
-            TwitchMessageBuilder::listOfUsersSystemMessage(
-                "Users joined:", *joinedUsers, &this->channel_, &builder);
-            builder->flags.set(MessageFlag::Collapsed);
-            this->channel_.addMessage(builder.release(),
-                                      MessageContext::Original);
+            this->channel_.addMessage(
+                MessageBuilder::makeListOfUsersMessage(
+                    "Users joined:", *joinedUsers, &this->channel_,
+                    {MessageFlag::Collapsed}),
+                MessageContext::Original);
 
             joinedUsers->clear();
             this->joinedUsersMergeQueued_ = false;
@@ -65,12 +63,11 @@ void ChannelChatters::addPartedUser(const QString &user)
             auto partedUsers = this->partedUsers_.access();
             partedUsers->sort();
 
-            MessageBuilder builder;
-            TwitchMessageBuilder::listOfUsersSystemMessage(
-                "Users parted:", *partedUsers, &this->channel_, &builder);
-            builder->flags.set(MessageFlag::Collapsed);
-            this->channel_.addMessage(builder.release(),
-                                      MessageContext::Original);
+            this->channel_.addMessage(
+                MessageBuilder::makeListOfUsersMessage(
+                    "Users parted:", *partedUsers, &this->channel_,
+                    {MessageFlag::Collapsed}),
+                MessageContext::Original);
 
             partedUsers->clear();
             this->partedUsersMergeQueued_ = false;