Faster switching of rooms from different accounts

Use a single [userId, roomId] property for the chat page.
This gets read of the intermediate state where the userId property has
been updated but the roomId one not yet, which led to the page unloading
and reloading itself until both were properly set.

Side-effect: when starting Mirage after this commit for the first time,
the last saved page will not load and user must click a room or
other page manually.

src/gui/MainPane/RoomList.qml

@@ -19,10 +19,10 @@ HListView {
         window.uiState.page === "Pages/Chat/Chat.qml"
 
     readonly property string wantedUserId:
-        window.uiState.pageProperties.userId || ""
+        (window.uiState.pageProperties.userRoomId || [])[0] || ""
 
     readonly property string wantedRoomId:
-        window.uiState.pageProperties.roomId || ""
+        (window.uiState.pageProperties.userRoomId || [])[1] || ""
 
     readonly property var accountIndice: {
         const accounts = {}

src/gui/PageLoader.qml

@@ -45,7 +45,7 @@ HLoader {
     }
 
     function showRoom(userId, roomId) {
-        show("Pages/Chat/Chat.qml", {userId, roomId})
+        show("Pages/Chat/Chat.qml", {userRoomId: [userId, roomId]})
     }
 
     function showPrevious(timesBack=1) {

src/gui/Pages/Chat/Chat.qml

@@ -9,19 +9,28 @@ import "RoomPane"
 Item {
     id: chat
 
-    property string userId
+    // [userId, roomId] - Set this instead of changing the userId and roomId
-    property string roomId
+    // properties one by one, else QML has time to be in an invalid state
-
+    // between the two changes.
-    property QtObject userInfo: ModelStore.get("accounts").find(userId)
+    property var userRoomId
-    property QtObject roomInfo: ModelStore.get(userId, "rooms").find(roomId)
-
-    property bool ready: Boolean(userInfo && roomInfo)
-    property bool longLoading: false
 
     property string replyToEventId: ""
     property string replyToUserId: ""
     property string replyToDisplayName: ""
 
+    property bool longLoading: false
+
+    readonly property string userId: userRoomId[0]
+    readonly property string roomId: userRoomId[1]
+
+    readonly property QtObject userInfo:
+        ModelStore.get("accounts").find(userRoomId[0])
+
+    readonly property QtObject roomInfo:
+        ModelStore.get(userRoomId[0], "rooms").find(userRoomId[1])
+
+    readonly property bool ready: Boolean(userInfo && roomInfo)
+
     readonly property alias loader: loader
     readonly property alias roomPane: roomPaneLoader.item
 

src/gui/Pages/Chat/RoomPane/MemberView/MemberView.qml

@@ -8,7 +8,7 @@ import "../../../../Base"
 HColumnLayout {
     readonly property alias keybindFocusItem: filterField
     readonly property var modelSyncId:
-        [chat.userId, chat.roomId, "filtered_members"]
+        [chat.userRoomId[0], chat.userRoomId[1], "filtered_members"]
 
     readonly property alias viewDepth: stackView.depth
     readonly property alias filterField: filterField

src/gui/Pages/Chat/Timeline/EventList.qml

@@ -201,8 +201,8 @@ Rectangle {
         onActivated: window.makePopup(
             "Popups/ClearMessagesPopup.qml",
             {
-                userId: window.uiState.pageProperties.userId,
+                userId: window.uiState.pageProperties.userRoomId[0],
-                roomId: window.uiState.pageProperties.roomId,
+                roomId: window.uiState.pageProperties.userRoomId[1],
                 preClearCallback: eventList.uncheckAll,
             }
         )
@@ -506,7 +506,7 @@ Rectangle {
         // reloaded from network.
         cacheBuffer: Screen.desktopAvailableHeight * 2
 
-        model: ModelStore.get(chat.userId, chat.roomId, "events")
+        model: ModelStore.get(chat.userRoomId[0], chat.userRoomId[1], "events")
         delegate: EventDelegate {}
 
         highlight: Rectangle {

src/gui/Popups/ForgetRoomPopup.qml

@@ -16,8 +16,8 @@ HFlickableColumnPopup {
     function forget() {
         py.callClientCoro(userId, "room_forget", [roomId], () => {
             if (window.uiState.page === "Pages/Chat/Chat.qml" &&
-                window.uiState.pageProperties.userId === userId &&
+                window.uiState.pageProperties.userRoomId[0] === userId &&
-                window.uiState.pageProperties.roomId === roomId)
+                window.uiState.pageProperties.userRoomId[1] === roomId)
             {
                 window.mainUI.pageLoader.showPrevious() ||
                 window.mainUI.pageLoader.show("Pages/Default.qml")

src/gui/Popups/InvalidAccessTokenPopup.qml

@@ -31,7 +31,10 @@ HFlickableColumnPopup {
         }
     }
 
-    onClosed: if (window.uiState.pageProperties.userId === userId) addAccount()
+    onClosed: if (
+        window.uiState.pageProperties.userId === userId ||
+        (window.uiState.pageProperties.userRoomId || [])[0] === userId
+    ) addAccount()
 
     SummaryLabel {
         text: qsTr("Signed out from %1").arg(coloredNameHtml("", userId))

src/gui/Popups/SignOutPopup.qml

@@ -35,9 +35,13 @@ HFlickableColumnPopup {
             icon.name: "sign-out"
 
             onClicked: {
-                if (ModelStore.get("accounts").count < 2 ||
+                const showAdd =
-                    window.uiState.pageProperties.userId === userId)
+                    ModelStore.get("accounts").count < 2 ||
-                {
+                    window.uiState.pageProperties.userId === userId ||
+                    (window.uiState.pageProperties.userRoomId || [])[0] ===
+                        userId
+
+                if (showAdd) {
                     const page = "Pages/AddAccount/AddAccount.qml"
                     window.mainUI.pageLoader.show(page)
                 }