matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Merge pull request #1391 from matrix-org/dbkr/fix_slash_join

Browse Source 
Make /join join again
This commit is contained in:
David Baker
2017-09-15 09:56:02 +01:00
committed by GitHub
parent c814f02f34 f3a4856593
commit 1b355e1a13
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/stores/RoomViewStore.js
View File

@@ -132,6 +132,10 @@ class RoomViewStore extends Store {
}
this._setState(newState);
if (payload.auto_join) {
this._joinRoom(payload);
}
} else if (payload.room_alias) {
// Resolve the alias and then do a second dispatch with the room ID acquired
this._setState({
@@ -151,6 +155,7 @@ class RoomViewStore extends Store {
event_id: payload.event_id,
highlighted: payload.highlighted,
room_alias: payload.room_alias,
auto_join: payload.auto_join,
oob_data: payload.oob_data,
});
}, (err) => {