Merge branch 'master' into irc-support

2019-09-18 13:03:16 +02:00
parent 997a0598cd b06918eb47
commit 3ab7362304
204 changed files with 17026 additions and 16467 deletions
@@ -1,68 +1,68 @@
-#include "IrcChannel2.hpp"
-
-#include "debug/AssertInGuiThread.hpp"
-#include "messages/MessageBuilder.hpp"
-#include "providers/irc/IrcCommands.hpp"
-#include "providers/irc/IrcServer.hpp"
-
-namespace chatterino {
-
-IrcChannel::IrcChannel(const QString &name, IrcServer *server)
-    : Channel(name, Channel::Type::Irc)
-    , ChannelChatters(*static_cast<Channel *>(this))
-    , server_(server)
-{
-}
-
-void IrcChannel::sendMessage(const QString &message)
-{
-    assertInGuiThread();
-
-    if (message.startsWith("/"))
-    {
-        int index = message.indexOf(' ', 1);
-        QString command = message.mid(1, index - 1);
-        QString params = index == -1 ? "" : message.mid(index + 1);
-
-        invokeIrcCommand(command, params, *this);
-    }
-    else
-    {
-        if (this->server())
-            this->server()->sendMessage(this->getName(), message);
-
-        MessageBuilder builder;
-        builder.emplace<TimestampElement>();
-        builder.emplace<TextElement>(this->server()->nick() + ":",
-                                     MessageElementFlag::Username);
-        builder.emplace<TextElement>(message, MessageElementFlag::Text);
-        this->addMessage(builder.release());
-    }
-}
-
-IrcServer *IrcChannel::server()
-{
-    assertInGuiThread();
-
-    return this->server_;
-}
-
-void IrcChannel::setServer(IrcServer *server)
-{
-    assertInGuiThread();
-
-    this->server_ = server;
-}
-
-bool IrcChannel::canReconnect() const
-{
-    return true;
-}
-
-void IrcChannel::reconnect()
-{
-    if (this->server())
-        this->server()->connect();
-}
-
-}  // namespace chatterino
+#include "IrcChannel2.hpp"
+
+#include "debug/AssertInGuiThread.hpp"
+#include "messages/MessageBuilder.hpp"
+#include "providers/irc/IrcCommands.hpp"
+#include "providers/irc/IrcServer.hpp"
+
+namespace chatterino {
+
+IrcChannel::IrcChannel(const QString &name, IrcServer *server)
+    : Channel(name, Channel::Type::Irc)
+    , ChannelChatters(*static_cast<Channel *>(this))
+    , server_(server)
+{
+}
+
+void IrcChannel::sendMessage(const QString &message)
+{
+    assertInGuiThread();
+
+    if (message.startsWith("/"))
+    {
+        int index = message.indexOf(' ', 1);
+        QString command = message.mid(1, index - 1);
+        QString params = index == -1 ? "" : message.mid(index + 1);
+
+        invokeIrcCommand(command, params, *this);
+    }
+    else
+    {
+        if (this->server())
+            this->server()->sendMessage(this->getName(), message);
+
+        MessageBuilder builder;
+        builder.emplace<TimestampElement>();
+        builder.emplace<TextElement>(this->server()->nick() + ":",
+                                     MessageElementFlag::Username);
+        builder.emplace<TextElement>(message, MessageElementFlag::Text);
+        this->addMessage(builder.release());
+    }
+}
+
+IrcServer *IrcChannel::server()
+{
+    assertInGuiThread();
+
+    return this->server_;
+}
+
+void IrcChannel::setServer(IrcServer *server)
+{
+    assertInGuiThread();
+
+    this->server_ = server;
+}
+
+bool IrcChannel::canReconnect() const
+{
+    return true;
+}
+
+void IrcChannel::reconnect()
+{
+    if (this->server())
+        this->server()->connect();
+}
+
+}  // namespace chatterino