From 201aa82c0424b63da62da8281525137db4fa8d77 Mon Sep 17 00:00:00 2001
From: James Graham <james.h.graham@protonmail.com>
Date: Sat, 25 Nov 2023 15:07:15 +0000
Subject: [PATCH] Remove controller::joinRoom

Remove controller::joinRoom in favour of using RoomManager::OpenResource
---
 src/controller.cpp                 | 12 ------------
 src/controller.h                   |  5 -----
 src/models/actionsmodel.cpp        |  4 ++--
 src/qml/ExploreComponent.qml       |  2 +-
 src/qml/ExploreComponentMobile.qml |  2 +-
 src/qml/GlobalMenu.qml             |  2 +-
 src/qml/RoomListPage.qml           |  2 +-
 src/qml/SpaceHierarchyDelegate.qml |  2 +-
 8 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/src/controller.cpp b/src/controller.cpp
index 181d187c5..26c37cfb0 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -370,18 +370,6 @@ void Controller::saveWindowGeometry()
     WindowController::instance().saveGeometry();
 }
 
-// TODO: Remove in favor of RoomManager::joinRoom
-void Controller::joinRoom(const QString &alias)
-{
-    if (!alias.contains(":"_ls)) {
-        Q_EMIT errorOccured(i18n("The room id you are trying to join is not valid"));
-        return;
-    }
-
-    const auto knownServer = alias.mid(alias.indexOf(":"_ls) + 1);
-    RoomManager::instance().joinRoom(m_connection, alias, QStringList{knownServer});
-}
-
 void Controller::forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item)
 {
     // HACK: Workaround bug QTBUG 93281
diff --git a/src/controller.h b/src/controller.h
index 61ea444bb..7afe0c614 100644
--- a/src/controller.h
+++ b/src/controller.h
@@ -100,11 +100,6 @@ public:
      */
     bool saveAccessTokenToKeyChain(const Quotient::AccountSettings &account, const QByteArray &accessToken);
 
-    /**
-     * @brief Join a room.
-     */
-    Q_INVOKABLE void joinRoom(const QString &alias);
-
     [[nodiscard]] bool supportSystemTray() const;
 
     /**
diff --git a/src/models/actionsmodel.cpp b/src/models/actionsmodel.cpp
index 29ec325b1..cecf18739 100644
--- a/src/models/actionsmodel.cpp
+++ b/src/models/actionsmodel.cpp
@@ -235,7 +235,7 @@ QList<ActionsModel::Action> actions{
                 return QString();
             }
             Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Joining room <roomname>.", "Joining room %1.", text));
-            Controller::instance().joinRoom(text);
+            RoomManager::instance().openResource(text, "join"_ls);
             return QString();
         },
         false,
@@ -290,7 +290,7 @@ QList<ActionsModel::Action> actions{
                 return QString();
             }
             Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Joining room <roomname>.", "Joining room %1.", text));
-            Controller::instance().joinRoom(text);
+            RoomManager::instance().openResource(text, "join"_ls);
             return QString();
         },
         false,
diff --git a/src/qml/ExploreComponent.qml b/src/qml/ExploreComponent.qml
index 6e5c90c9d..dbbe0ac59 100644
--- a/src/qml/ExploreComponent.qml
+++ b/src/qml/ExploreComponent.qml
@@ -26,7 +26,7 @@ RowLayout {
                 if (isJoined) {
                     RoomManager.enterRoom(root.connection.room(roomId))
                 } else {
-                    Controller.joinRoom(roomId.length > 0 ? roomId : alias)
+                    RoomManager.openResource(roomId.length > 0 ? roomId : alias, "join")
                 }
             })
         }
diff --git a/src/qml/ExploreComponentMobile.qml b/src/qml/ExploreComponentMobile.qml
index 04c15060b..a2382913b 100644
--- a/src/qml/ExploreComponentMobile.qml
+++ b/src/qml/ExploreComponentMobile.qml
@@ -57,7 +57,7 @@ ColumnLayout {
                         if (isJoined) {
                             RoomManager.enterRoom(root.connection.room(roomId));
                         } else {
-                            Controller.joinRoom(roomId.length > 0 ? roomId : alias);
+                            RoomManager.openResource(roomId.length > 0 ? roomId : alias, "join");
                         }
                     })
                     exploreTabBar.currentIndex = -1;
diff --git a/src/qml/GlobalMenu.qml b/src/qml/GlobalMenu.qml
index b74f65345..d6bbddcf0 100644
--- a/src/qml/GlobalMenu.qml
+++ b/src/qml/GlobalMenu.qml
@@ -66,7 +66,7 @@ Labs.MenuBar {
                     if (isJoined) {
                         RoomManager.enterRoom(root.connection.room(roomId))
                     } else {
-                        Controller.joinRoom(roomId)
+                        RoomManager.openResource(roomId, "join")
                     }
                 })
             }
diff --git a/src/qml/RoomListPage.qml b/src/qml/RoomListPage.qml
index 19136c612..ff5691e4d 100644
--- a/src/qml/RoomListPage.qml
+++ b/src/qml/RoomListPage.qml
@@ -191,7 +191,7 @@ Kirigami.Page {
                                 if (isJoined) {
                                     RoomManager.enterRoom(root.connection.room(roomId))
                                 } else {
-                                    Controller.joinRoom(roomId)
+                                    RoomManager.openResource(roomId, "join")
                                 }
                             })
                         }
diff --git a/src/qml/SpaceHierarchyDelegate.qml b/src/qml/SpaceHierarchyDelegate.qml
index dd7c552ac..2bd5979be 100644
--- a/src/qml/SpaceHierarchyDelegate.qml
+++ b/src/qml/SpaceHierarchyDelegate.qml
@@ -149,7 +149,7 @@ Item {
                     if (root.isJoined) {
                         root.enterRoom()
                     } else {
-                        Controller.joinRoom(root.roomId)
+                        RoomManager.openResource(root.roomId, "join")
                     }
                 }
             }