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

Merge pull request #4003 from matrix-org/t3chguy/room_complete 

Fix room completion for invited rooms and upgraded rooms
pull/21833/head
Michael Telatynski 2020-01-30 21:16:06 +00:00 committed by GitHub
parent 8a09cfbfbd 7e45979e00
commit 3a9acb55e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/autocomplete/RoomProvider.js
View File

@ -56,7 +56,7 @@ export default class RoomProvider extends AutocompleteProvider {
const {command, range} = this.getCurrentCommand(query, selection, force); const {command, range} = this.getCurrentCommand(query, selection, force);
if (command) { if (command) {
// the only reason we need to do this is because Fuse only matches on properties // the only reason we need to do this is because Fuse only matches on properties
let matcherObjects = client.getRooms().filter( let matcherObjects = client.getVisibleRooms().filter(
(room) => !!room && !!getDisplayAliasForRoom(room), (room) => !!room && !!getDisplayAliasForRoom(room),
).map((room) => { ).map((room) => {
return { return {

2
src/editor/parts.js
View File

@ -426,7 +426,7 @@ export class PartCreator {
let room; let room;
if (alias[0] === '#') { if (alias[0] === '#') {
room = this._client.getRooms().find((r) => { room = this._client.getRooms().find((r) => {
return r.getAliases().includes(alias); return r.getCanonicalAlias() === alias || r.getAliases().includes(alias);
}); });
} else { } else {
room = this._client.getRoom(alias); room = this._client.getRoom(alias);