OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Correctly populate the dispatch for joining a room via servers
pull/21833/head
Travis Ralston 2019-07-01 09:47:46 -06:00 committed by GitHub
parent 64f0a7cbe7 e65cc3b189
commit 38bfe8b1ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SlashCommands.js
View File

@ -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);