Add extra context to messages that are added to channels, allowing the logging controller to take more responsibility in what messages to log (#5499)

Co-auhtored-by: James Upjohn <jupjohn@jammeh.co.nz>

src/providers/irc/AbstractIrcServer.cpp

@@ -156,7 +156,7 @@ void AbstractIrcServer::addGlobalSystemMessage(const QString &messageText)
             continue;
         }
 
-        chan->addMessage(message);
+        chan->addMessage(message, MessageContext::Original);
     }
 }
 
@@ -329,7 +329,7 @@ void AbstractIrcServer::onReadConnected(IrcConnection *connection)
         }
         else
         {
-            chan->addMessage(connectedMsg);
+            chan->addMessage(connectedMsg, MessageContext::Original);
         }
     }
 
@@ -357,7 +357,7 @@ void AbstractIrcServer::onDisconnected()
             continue;
         }
 
-        chan->addMessage(disconnectedMsg);
+        chan->addMessage(disconnectedMsg, MessageContext::Original);
 
         if (auto *channel = dynamic_cast<TwitchChannel *>(chan.get()))
         {

src/providers/irc/IrcChannel2.cpp

@@ -17,6 +17,16 @@ IrcChannel::IrcChannel(const QString &name, IrcServer *server)
     , ChannelChatters(*static_cast<Channel *>(this))
     , server_(server)
 {
+    auto *ircServer = this->server();
+    if (ircServer != nullptr)
+    {
+        this->platform_ =
+            QString("irc-%1").arg(ircServer->userFriendlyIdentifier());
+    }
+    else
+    {
+        this->platform_ = "irc-unknown";
+    }
 }
 
 void IrcChannel::sendMessage(const QString &message)
@@ -70,7 +80,7 @@ void IrcChannel::sendMessage(const QString &message)
             builder.message().messageText = message;
             builder.message().searchText = username + ": " + message;
 
-            this->addMessage(builder.release());
+            this->addMessage(builder.release(), MessageContext::Original);
         }
         else
         {
@@ -79,7 +89,7 @@ void IrcChannel::sendMessage(const QString &message)
     }
 }
 
-IrcServer *IrcChannel::server()
+IrcServer *IrcChannel::server() const
 {
     assertInGuiThread();
 

src/providers/irc/IrcChannel2.hpp

@@ -16,7 +16,7 @@ public:
     void sendMessage(const QString &message) override;
 
     // server may be nullptr
-    IrcServer *server();
+    IrcServer *server() const;
 
     // Channel methods
     bool canReconnect() const override;

src/providers/irc/IrcServer.cpp

@@ -111,7 +111,8 @@ void IrcServer::initializeConnectionSignals(IrcConnection *connection,
                          {
                              if (auto shared = weak.lock())
                              {
-                                 shared->addMessage(msg);
+                                 shared->addMessage(msg,
+                                                    MessageContext::Original);
                              }
                          }
                      });
@@ -218,7 +219,7 @@ void IrcServer::privateMessageReceived(Communi::IrcPrivateMessage *message)
         {
             if (auto shared = weak.lock())
             {
-                shared->addMessage(msg);
+                shared->addMessage(msg, MessageContext::Original);
             }
         }
         return;
@@ -236,7 +237,7 @@ void IrcServer::privateMessageReceived(Communi::IrcPrivateMessage *message)
         {
             auto msg = builder.build();
 
-            channel->addMessage(msg);
+            channel->addMessage(msg, MessageContext::Original);
             builder.triggerHighlights();
             const auto highlighted = msg->flags.has(MessageFlag::Highlighted);
             const auto showInMentions =
@@ -244,7 +245,8 @@ void IrcServer::privateMessageReceived(Communi::IrcPrivateMessage *message)
 
             if (highlighted && showInMentions)
             {
-                getIApp()->getTwitch()->getMentionsChannel()->addMessage(msg);
+                getIApp()->getTwitch()->getMentionsChannel()->addMessage(
+                    msg, MessageContext::Original);
             }
         }
         else
@@ -332,7 +334,7 @@ void IrcServer::readConnectionMessageReceived(Communi::IrcMessage *message)
                 {
                     if (auto shared = weak.lock())
                     {
-                        shared->addMessage(msg);
+                        shared->addMessage(msg, MessageContext::Original);
                     }
                 }
             };
@@ -366,7 +368,7 @@ void IrcServer::sendWhisper(const QString &target, const QString &message)
     {
         if (auto shared = weak.lock())
         {
-            shared->addMessage(msg);
+            shared->addMessage(msg, MessageContext::Original);
         }
     }
 }