mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 10:15:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4211 from matrix-org/bwindels/viaserversfromroomdir-release

Browse source 
Fix: best-effort to join room without canonical alias over federation from room directory
This commit is contained in:
Bruno Windels 2020-03-13 10:42:05 +00:00 committed by GitHub
commit 8d56fb4c35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -406,6 +406,12 @@ export default createReactClass({
// would normally decide what the name is. // would normally decide what the name is.
name: room.name || room_alias || _t('Unnamed room'), name: room.name || room_alias || _t('Unnamed room'),
}; };
if (this.state.roomServer) {
payload.opts = {
viaServers: [this.state.roomServer],
};
}
} }
// It's not really possible to join Matrix rooms by ID because the HS has no way to know // It's not really possible to join Matrix rooms by ID because the HS has no way to know
// which servers to start querying. However, there's no other way to join rooms in // which servers to start querying. However, there's no other way to join rooms in