From 5966fade0b4875654b597fcaded0141502edd749 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 28 Apr 2021 09:04:02 +0100
Subject: [PATCH 1/2] Fix joining room using via servers regression

---
 src/stores/RoomViewStore.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/stores/RoomViewStore.tsx b/src/stores/RoomViewStore.tsx
index 601c77cdf33..8dda310ab4e 100644
--- a/src/stores/RoomViewStore.tsx
+++ b/src/stores/RoomViewStore.tsx
@@ -60,6 +60,8 @@ const INITIAL_STATE = {
     replyingToEvent: null,
 
     shouldPeek: false,
+
+    viaServers: [],
 };
 
 /**
@@ -113,6 +115,7 @@ class RoomViewStore extends Store<ActionPayload> {
                 this.setState({
                     roomId: null,
                     roomAlias: null,
+                    viaServers: [],
                 });
                 break;
             case 'view_room_error':
@@ -191,6 +194,7 @@ class RoomViewStore extends Store<ActionPayload> {
                 replyingToEvent: null,
                 // pull the user out of Room Settings
                 isEditingSettings: false,
+                viaServers: payload.via_servers,
             };
 
             // Allow being given an event to be replied to when switching rooms but sanity check its for this room
@@ -226,6 +230,7 @@ class RoomViewStore extends Store<ActionPayload> {
                     roomAlias: payload.room_alias,
                     roomLoading: true,
                     roomLoadError: null,
+                    viaServers: payload.via_servers,
                 });
                 try {
                     const result = await MatrixClientPeg.get().getRoomIdForAlias(payload.room_alias);
@@ -261,6 +266,7 @@ class RoomViewStore extends Store<ActionPayload> {
             roomAlias: payload.room_alias,
             roomLoading: false,
             roomLoadError: payload.err,
+            viaServers: [],
         });
     }
 
@@ -273,8 +279,9 @@ class RoomViewStore extends Store<ActionPayload> {
         const cli = MatrixClientPeg.get();
         const address = this.state.roomAlias || this.state.roomId;
         try {
+            const viaServers = this.state.viaServers || [];
             await retry<void, MatrixError>(() => cli.joinRoom(address, {
-                viaServers: payload.via_servers,
+                viaServers,
                 ...payload.opts,
             }), NUM_JOIN_RETRY, (err) => {
                 // if we received a Gateway timeout then retry

From 27731ac25bacee066284f5e9fff6654f769f952b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 28 Apr 2021 09:07:02 +0100
Subject: [PATCH 2/2] tidy

---
 src/stores/RoomViewStore.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/RoomViewStore.tsx b/src/stores/RoomViewStore.tsx
index 8dda310ab4e..a5bdb7ef33b 100644
--- a/src/stores/RoomViewStore.tsx
+++ b/src/stores/RoomViewStore.tsx
@@ -278,8 +278,8 @@ class RoomViewStore extends Store<ActionPayload> {
 
         const cli = MatrixClientPeg.get();
         const address = this.state.roomAlias || this.state.roomId;
+        const viaServers = this.state.viaServers || [];
         try {
-            const viaServers = this.state.viaServers || [];
             await retry<void, MatrixError>(() => cli.joinRoom(address, {
                 viaServers,
                 ...payload.opts,