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

Make /join join again 

The auto_join parameter to view_room got broken at some point so
/join took you to the room and then sat there like a lemon.

Fixes https://github.com/vector-im/riot-web/issues/5029
pull/21833/head
David Baker 2017-09-14 23:06:00 +01:00
parent 081a900524
commit 1f837d2ae1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/structures/MatrixChat.js
View File

@ -672,7 +672,6 @@ module.exports = React.createClass({
page_type: PageTypes.RoomView, page_type: PageTypes.RoomView,
thirdPartyInvite: roomInfo.third_party_invite, thirdPartyInvite: roomInfo.third_party_invite,
roomOobData: roomInfo.oob_data, roomOobData: roomInfo.oob_data,
autoJoin: roomInfo.auto_join,
}; };
if (roomInfo.room_alias) { if (roomInfo.room_alias) {

5
src/stores/RoomViewStore.js
View File

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