From b4e996aecd2af0a9c3e8661a78cd8389acaeb0e2 Mon Sep 17 00:00:00 2001
From: Arnav Rawat <rawat.arnav@gmail.com>
Date: Fri, 29 Jan 2021 17:58:57 -0600
Subject: [PATCH] Adds ability to specify server with /join Fixes bug #232

---
 src/actionshandler.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/actionshandler.cpp b/src/actionshandler.cpp
index 6bf18ec24..a6aa88fc8 100644
--- a/src/actionshandler.cpp
+++ b/src/actionshandler.cpp
@@ -137,6 +137,7 @@ void ActionsHandler::joinRoom(const QString &alias)
     const auto knownServer = alias.mid(alias.indexOf(":") + 1);
     auto joinRoomJob = m_connection->joinRoom(alias, QStringList{knownServer});
 
+    qDebug() << alias;
     Quotient::JoinRoomJob::connect(joinRoomJob, &JoinRoomJob::failure, [=] {
         Q_EMIT showMessage(MessageType::Error, i18n("Server error when joining the room \"%1\": %2",
                     joinRoomJob->errorString()));
@@ -253,7 +254,13 @@ void ActionsHandler::postMessage(const QString &text,
             Q_EMIT showMessage(MessageType::Error, i18n("Invalid command"));
             return;
         }
-        joinRoom(splittedText[0]);
+        if (splittedText.count() > 1) {
+            joinRoom(splittedText[0] + ":" + splittedText[1]);
+            return;
+        }
+        else {
+            joinRoom(splittedText[0] + ":matrix.org");
+        }
         return;
     }