PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #5235 from matrix-org/t3chguy/15228

Browse source 
Fix Room Directory View & Preview actions for federated joins
This commit is contained in:
Michael Telatynski 2020-09-18 22:10:23 +01:00 committed by GitHub
commit 1b335da1b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -392,22 +392,12 @@ export default class RoomDirectory extends React.Component {
}; };
onPreviewClick = (ev, room) => { onPreviewClick = (ev, room) => {
this.props.onFinished(); this.showRoom(room, null, false, true);
dis.dispatch({
action: 'view_room',
room_id: room.room_id,
should_peek: true,
});
ev.stopPropagation(); ev.stopPropagation();
}; };
onViewClick = (ev, room) => { onViewClick = (ev, room) => {
this.props.onFinished(); this.showRoom(room);
dis.dispatch({
action: 'view_room',
room_id: room.room_id,
should_peek: false,
});
ev.stopPropagation(); ev.stopPropagation();
}; };
@ -428,11 +418,12 @@ export default class RoomDirectory extends React.Component {
this.showRoom(null, alias, autoJoin); this.showRoom(null, alias, autoJoin);
} }
showRoom(room, room_alias, autoJoin=false) { showRoom(room, room_alias, autoJoin = false, shouldPeek = false) {
this.props.onFinished(); this.props.onFinished();
const payload = { const payload = {
action: 'view_room', action: 'view_room',
auto_join: autoJoin, auto_join: autoJoin,
should_peek: shouldPeek,
}; };
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
@ -457,6 +448,7 @@ export default class RoomDirectory extends React.Component {
}; };
if (this.state.roomServer) { if (this.state.roomServer) {
payload.via_servers = [this.state.roomServer];
payload.opts = { payload.opts = {
viaServers: [this.state.roomServer], viaServers: [this.state.roomServer],
}; };