imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3136 from matrix-org/t3chguy/room_directory_autojoin

Browse source 
When joining from room directory, use auto_join
This commit is contained in:
Travis Ralston 2019-06-25 12:28:41 -06:00 • committed by GitHub
commit 9771ce1e04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/components/structures/RoomDirectory.js
View file

@ -333,7 +333,7 @@ module.exports = React.createClass({
if (alias.indexOf(':') == -1) { if (alias.indexOf(':') == -1) {
alias = alias + ':' + this.state.roomServer; alias = alias + ':' + this.state.roomServer;
} }
this.showRoomAlias(alias); this.showRoomAlias(alias, true);
} else { } else {
// This is a 3rd party protocol. Let's see if we can join it // This is a 3rd party protocol. Let's see if we can join it
const protocolName = protocolNameForInstanceId(this.protocols, this.state.instanceId); const protocolName = protocolNameForInstanceId(this.protocols, this.state.instanceId);
@ -349,7 +349,7 @@ module.exports = React.createClass({
} }
MatrixClientPeg.get().getThirdpartyLocation(protocolName, fields).done((resp) => { MatrixClientPeg.get().getThirdpartyLocation(protocolName, fields).done((resp) => {
if (resp.length > 0 && resp[0].alias) { if (resp.length > 0 && resp[0].alias) {
this.showRoomAlias(resp[0].alias); this.showRoomAlias(resp[0].alias, true);
} else { } else {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Room not found', '', ErrorDialog, { Modal.createTrackedDialog('Room not found', '', ErrorDialog, {
@ -367,13 +367,16 @@ module.exports = React.createClass({
} }
}, },
showRoomAlias: function(alias) { showRoomAlias: function(alias, autoJoin=false) {
this.showRoom(null, alias); this.showRoom(null, alias, autoJoin);
}, },
showRoom: function(room, room_alias) { showRoom: function(room, room_alias, autoJoin=false) {
this.props.onFinished(); this.props.onFinished();
const payload = {action: 'view_room'}; const payload = {
action: 'view_room',
auto_join: autoJoin,
};
if (room) { if (room) {
// Don't let the user view a room they won't be able to either // Don't let the user view a room they won't be able to either
// peek or join: fail earlier so they don't have to click back // peek or join: fail earlier so they don't have to click back