smol irc fixes

src/providers/irc/AbstractIrcServer.cpp

@@ -164,26 +164,24 @@ ChannelPtr AbstractIrcServer::getOrAddChannel(const QString &dirtyChannelName)
         return Channel::getEmpty();
     }
 
-    QString clojuresInCppAreShit = channelName;
-
     this->channels.insert(channelName, chan);
-    chan->destroyed.connect([this, clojuresInCppAreShit] {
+    this->connections_.emplace_back(chan->destroyed.connect([this,
+                                                             channelName] {
         // fourtf: issues when the server itself is destroyed
 
-        log("[AbstractIrcServer::addChannel] {} was destroyed",
-            clojuresInCppAreShit);
-        this->channels.remove(clojuresInCppAreShit);
+        log("[AbstractIrcServer::addChannel] {} was destroyed", channelName);
+        this->channels.remove(channelName);
 
         if (this->readConnection_)
         {
-            this->readConnection_->sendRaw("PART #" + clojuresInCppAreShit);
+            this->readConnection_->sendRaw("PART #" + channelName);
         }
 
         if (this->writeConnection_ && this->hasSeparateWriteConnection())
         {
-            this->writeConnection_->sendRaw("PART #" + clojuresInCppAreShit);
+            this->writeConnection_->sendRaw("PART #" + channelName);
         }
-    });
+    }));
 
     // join irc channel
     {
@@ -191,12 +189,18 @@ ChannelPtr AbstractIrcServer::getOrAddChannel(const QString &dirtyChannelName)
 
         if (this->readConnection_)
         {
-            this->readConnection_->sendRaw("JOIN #" + channelName);
+            if (this->readConnection_->isConnected())
+            {
+                this->readConnection_->sendRaw("JOIN #" + channelName);
+            }
         }
 
         if (this->writeConnection_ && this->hasSeparateWriteConnection())
         {
-            this->writeConnection_->sendRaw("JOIN #" + channelName);
+            if (this->readConnection_->isConnected())
+            {
+                this->writeConnection_->sendRaw("JOIN #" + channelName);
+            }
         }
     }
 

src/providers/irc/AbstractIrcServer.hpp

@@ -4,6 +4,7 @@
 
 #include <IrcMessage>
 #include <pajlada/signals/signal.hpp>
+#include <pajlada/signals/signalholder.hpp>
 
 #include <functional>
 #include <mutex>
@@ -84,6 +85,7 @@ private:
     std::mutex connectionMutex_;
 
     //    bool autoReconnect_ = false;
+    pajlada::Signals::SignalHolder connections_;
 };
 
 }  // namespace chatterino

src/providers/irc/IrcServer.cpp

@@ -57,8 +57,10 @@ void IrcServer::initializeConnection(IrcConnection *connection, bool isRead,
     connection->setPort(this->data_->port);
 
     connection->setUserName(this->data_->user);
-    connection->setNickName(this->data_->nick);
-    connection->setRealName(this->data_->real);
+    connection->setNickName(this->data_->nick.isEmpty() ? this->data_->user
+                                                        : this->data_->nick);
+    connection->setRealName(this->data_->real.isEmpty() ? this->data_->user
+                                                        : this->data_->nick);
     connection->setPassword(this->data_->password);
 }
 
@@ -72,6 +74,21 @@ bool IrcServer::hasSeparateWriteConnection() const
     return false;
 }
 
+void IrcServer::onReadConnected(IrcConnection *connection)
+{
+    AbstractIrcServer::onReadConnected(connection);
+
+    std::lock_guard lock(this->channelMutex);
+
+    for (auto &&weak : this->channels)
+    {
+        if (auto channel = weak.lock())
+        {
+            connection->sendRaw("JOIN #" + channel->getName());
+        }
+    }
+}
+
 void IrcServer::privateMessageReceived(Communi::IrcPrivateMessage *message)
 {
     auto target = message->target();
@@ -81,6 +98,7 @@ void IrcServer::privateMessageReceived(Communi::IrcPrivateMessage *message)
     {
         MessageBuilder builder;
 
+        builder.emplace<TimestampElement>();
         builder.emplace<TextElement>(message->nick() + ":",
                                      MessageElementFlag::Username);
         builder.emplace<TextElement>(message->content(),

src/providers/irc/IrcServer.hpp

@@ -25,6 +25,8 @@ protected:
                               bool isWrite) override;
     std::shared_ptr<Channel> createChannel(const QString &channelName) override;
     bool hasSeparateWriteConnection() const override;
+
+    void onReadConnected(IrcConnection *connection) override;
     void privateMessageReceived(Communi::IrcPrivateMessage *message) override;
     void readConnectionMessageReceived(Communi::IrcMessage *message) override;