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

Merge pull request #4210 from matrix-org/bwindels/viaserversfromroomdir 

Fix: best-effort to join room without canonical alias over federation from room directory
pull/21833/head
Bruno Windels 2020-03-13 09:47:50 +00:00 committed by GitHub
parent d6d686622c 949ac2953e
commit f7fd623383
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