Merge pull request #3161 from matrix-org/travis/fix-via-join

Correctly populate the dispatch for joining a room via servers
matrix-org · Jul 1, 2019 · 38bfe8b · 38bfe8b
2 parents 64f0a7c + e65cc3b
commit 38bfe8b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/SlashCommands.js b/src/SlashCommands.js
@@ -402,8 +402,9 @@ export const CommandMap = {
                         room_id: roomId,
                         opts: {
                             // These are passed down to the js-sdk's /join call
-                            server_name: viaServers,
+                            viaServers: viaServers,
                         },
+                        via_servers: viaServers, // for the rejoin button
                         auto_join: true,
                     });
                     return success();
@@ -444,10 +445,14 @@ export const CommandMap = {
                     }
 
                     if (viaServers) {
+                        // For the join
                         dispatch["opts"] = {
                             // These are passed down to the js-sdk's /join call
-                            server_name: viaServers,
+                            viaServers: viaServers,
                         };
+
+                        // For if the join fails (rejoin button)
+                        dispatch['via_servers'] = viaServers;
                     }
 
                     dis.dispatch(dispatch);