fix: close logging-channels when closing channels (#5592)

Co-authored-by: kornes <28986062+kornes@users.noreply.github.com>
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>

src/singletons/Logging.cpp

@@ -2,7 +2,6 @@
 
 #include "messages/Message.hpp"
 #include "singletons/helper/LoggingChannel.hpp"
-#include "singletons/Paths.hpp"
 #include "singletons/Settings.hpp"
 
 #include <QDir>
@@ -58,7 +57,7 @@ void Logging::addMessage(const QString &channelName, MessagePtr message,
         auto map = std::map<QString, std::unique_ptr<LoggingChannel>>();
         this->loggingChannels_[platformName] = std::move(map);
         auto &ref = this->loggingChannels_.at(platformName);
-        ref.emplace(channelName, std::move(channel));
+        ref.emplace(channelName, channel);
         return;
     }
     auto chanIt = platIt->second.find(channelName);
@@ -66,7 +65,7 @@ void Logging::addMessage(const QString &channelName, MessagePtr message,
     {
         auto *channel = new LoggingChannel(channelName, platformName);
         channel->addMessage(message, streamID);
-        platIt->second.emplace(channelName, std::move(channel));
+        platIt->second.emplace(channelName, channel);
     }
     else
     {
@@ -74,4 +73,15 @@ void Logging::addMessage(const QString &channelName, MessagePtr message,
     }
 }
 
+void Logging::closeChannel(const QString &channelName,
+                           const QString &platformName)
+{
+    auto platIt = this->loggingChannels_.find(platformName);
+    if (platIt == this->loggingChannels_.end())
+    {
+        return;
+    }
+    platIt->second.erase(channelName);
+}
+
 }  // namespace chatterino

src/singletons/Logging.hpp

@@ -24,6 +24,9 @@ public:
     virtual void addMessage(const QString &channelName, MessagePtr message,
                             const QString &platformName,
                             const QString &streamID) = 0;
+
+    virtual void closeChannel(const QString &channelName,
+                              const QString &platformName) = 0;
 };
 
 class Logging : public ILogging
@@ -35,6 +38,9 @@ public:
                     const QString &platformName,
                     const QString &streamID) override;
 
+    void closeChannel(const QString &channelName,
+                      const QString &platformName) override;
+
 private:
     using PlatformName = QString;
     using ChannelName = QString;

src/singletons/helper/LoggingChannel.cpp

@@ -40,7 +40,7 @@ QString generateClosingString(
 {
     QString ret("# Stop logging at ");
 
-    ret.append(now.toString("yyyy-MM-dd HH:mm:ss"));
+    ret.append(now.toString("yyyy-MM-dd HH:mm:ss "));
     ret.append(now.timeZoneAbbreviation());
     ret.append(ENDLINE);