Combine makeLiveMessage and makeLiveSystemMessage into one function

Chatterino · Aug 18, 2024 · 03f7245 · 03f7245
1 parent 696d948
commit 03f7245
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 27 deletions.
diff --git a/src/messages/MessageBuilder.cpp b/src/messages/MessageBuilder.cpp
@@ -1475,7 +1475,8 @@ MessagePtr MessageBuilder::makeChannelPointRewardMessage(
 }
 
 MessagePtr MessageBuilder::makeLiveMessage(const QString &channelName,
-                                           const QString &channelID)
+                                           const QString &channelID,
+                                           MessageFlags extraFlags)
 {
     MessageBuilder builder;
 
@@ -1491,26 +1492,11 @@ MessagePtr MessageBuilder::makeLiveMessage(const QString &channelName,
     builder.message().searchText = text;
     builder.message().id = channelID;
 
-    return builder.release();
-}
+    if (!extraFlags.isEmpty())
+    {
+        builder.message().flags.set(extraFlags);
+    }
 
-MessagePtr MessageBuilder::makeLiveSystemMessage(const QString &channelName,
-                                                 const QString &channelID)
-{
-    MessageBuilder builder;
-    builder.emplace<TimestampElement>();
-    builder.message().flags.set(MessageFlag::System);
-    builder.message().flags.set(MessageFlag::DoNotTriggerNotification);
-    builder
-        .emplace<TextElement>(channelName, MessageElementFlag::Username,
-                              MessageColor::System, FontStyle::ChatMediumBold)
-        ->setLink({Link::UserInfo, channelName});
-    builder.emplace<TextElement>("is live!", MessageElementFlag::Text,
-                                 MessageColor::System);
-    auto text = QString("%1 is live!").arg(channelName);
-    builder.message().messageText = text;
-    builder.message().searchText = text;
-    builder.message().id = channelID;
     return builder.release();
 }
 

diff --git a/src/messages/MessageBuilder.hpp b/src/messages/MessageBuilder.hpp
@@ -3,6 +3,7 @@
 #include "common/Aliases.hpp"
 #include "common/Outcome.hpp"
 #include "messages/MessageColor.hpp"
+#include "messages/MessageFlag.hpp"
 #include "providers/twitch/pubsubmessages/LowTrustUsers.hpp"
 
 #include <IrcMessage>
@@ -199,13 +200,12 @@ class MessageBuilder
     static MessagePtr makeChannelPointRewardMessage(
         const ChannelPointReward &reward, bool isMod, bool isBroadcaster);
 
-    // Message in the /live chat for channel going live
+    /// Make a "CHANNEL_NAME has gone live!" message
     static MessagePtr makeLiveMessage(const QString &channelName,
-                                      const QString &channelID);
+                                      const QString &channelID,
+                                      MessageFlags extraFlags = {});
 
     // Messages in normal chat for channel stuff
-    static MessagePtr makeLiveSystemMessage(const QString &channelName,
-                                            const QString &channelID);
     static MessagePtr makeOfflineSystemMessage(const QString &channelName,
                                                const QString &channelID);
     static MessagePtr makeHostingSystemMessage(const QString &channelName,

diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
@@ -433,9 +433,11 @@ void TwitchChannel::onLiveStatusChanged(bool isLive, bool isInitialUpdate)
         });
 
         // Channel live message
-        this->addMessage(MessageBuilder::makeLiveSystemMessage(
-                             this->getDisplayName(), this->roomId()),
-                         MessageContext::Original);
+        this->addMessage(
+            MessageBuilder::makeLiveMessage(
+                this->getDisplayName(), this->roomId(),
+                {MessageFlag::System, MessageFlag::DoNotTriggerNotification}),
+            MessageContext::Original);
     }
     else
     {