matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-05 23:10:41 +03:00
Code Activity

Explain roomId workaround

Browse Source
This commit is contained in:
J. Ryan Stinnett
2019-02-12 08:59:38 +00:00
parent 9d3ba2b3d9
commit 44e34d9074
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/structures/RoomView.js
View File

@@ -283,6 +283,15 @@ module.exports = React.createClass({
} }
}, },
_getRoomId() {
// According to `_onRoomViewStoreUpdate`, `state.roomId` can be null
// if we have a room alias we haven't resolved yet. To work around this,
// first we'll try the room object if it's there, and then fallback to
// the bare room ID. (We may want to update `state.roomId` after
// resolving aliases, so we could always trust it.)
return this.state.room ? this.state.room.roomId : this.state.roomId;
},
_onWidgetEchoStoreUpdate: function() { _onWidgetEchoStoreUpdate: function() {
this.setState({ this.setState({
showApps: this._shouldShowApps(this.state.room), showApps: this._shouldShowApps(this.state.room),
@@ -882,7 +891,7 @@ module.exports = React.createClass({
action: 'do_after_sync_prepared', action: 'do_after_sync_prepared',
deferred_action: { deferred_action: {
action: 'view_room', action: 'view_room',
room_id: this.state.room ? this.state.room.roomId : this.state.roomId, room_id: this._getRoomId(),
}, },
}); });