Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Filter out upgraded rooms from autocomplete results #2830

Merged
turt2live merged 2 commits into from
Mar 27, 2019
Merged

Filter out upgraded rooms from autocomplete results #2830

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
340c24c
Filter out upgraded rooms from autocomplete results
turt2live Mar 26, 2019
85c8d4d
Remove extra debug lines
turt2live Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/autocomplete/RoomProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,29 @@ export default class RoomProvider extends AutocompleteProvider {
const {command, range} = this.getCurrentCommand(query, selection, force);
if (command) {
// the only reason we need to do this is because Fuse only matches on properties
this.matcher.setObjects(client.getRooms().filter(
let matcherObjects = client.getRooms().filter(
(room) => !!room && !!getDisplayAliasForRoom(room),
).map((room) => {
return {
room: room,
name: room.name,
displayedAlias: getDisplayAliasForRoom(room),
};
}));
});

// Filter out any matches where the user will have also autocompleted new rooms
matcherObjects = matcherObjects.filter((r) => {
const tombstone = r.room.currentState.getStateEvents("m.room.tombstone", "");
if (tombstone && tombstone.getContent() && tombstone.getContent()['replacement_room']) {
const hasReplacementRoom = matcherObjects.some(
Copy link
Copy Markdown
Contributor

@bwindels bwindels Mar 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This inner loop could slow down with big accounts I suppose? Wouldn't it be enough to exclude any rooms that have a tombstone event?

Copy link
Copy Markdown
Member Author

@turt2live turt2live Mar 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's the possibility that, for some reason, the user hasn't joined the upgraded room and the alias is still pointing at the old room. Out of abundance of caution, we might as well verify the room. On my massive account of ~2000 rooms, there's no noticeable performance impact of adding this check (in fact, it feels faster...)

(r2) => r2.room.roomId === tombstone.getContent()['replacement_room'],
);
return !hasReplacementRoom;
}
return true;
});

this.matcher.setObjects(matcherObjects);
const matchedString = command[0];
completions = this.matcher.match(matchedString);
completions = _sortBy(completions, [
Expand Down