fix: Suggest correct rooms

This commit is contained in:
Sorunome 2020-11-21 15:16:32 +01:00
parent 369983dd1b
commit b1e6014904

View file

@ -103,8 +103,11 @@ class InputBar extends StatelessWidget {
if (roomMatch != null) { if (roomMatch != null) {
final roomSearch = roomMatch[1].toLowerCase(); final roomSearch = roomMatch[1].toLowerCase();
for (final r in room.client.rooms) { for (final r in room.client.rooms) {
final state = r.getState('m.room.canonical_alias'); if (r.getState(EventTypes.RoomTombstone) != null) {
if (state != null && continue; // we don't care about tombstoned rooms
}
final state = r.getState(EventTypes.RoomCanonicalAlias);
if ((state != null &&
((state.content['alias'] is String && ((state.content['alias'] is String &&
state.content['alias'] state.content['alias']
.split(':')[0] .split(':')[0]
@ -113,9 +116,11 @@ class InputBar extends StatelessWidget {
(state.content['alt_aliases'] is List && (state.content['alt_aliases'] is List &&
state.content['alt_aliases'].any((l) => state.content['alt_aliases'].any((l) =>
l is String && l is String &&
l.split(':')[0].toLowerCase().contains(roomSearch))) || l
(room.name != null && .split(':')[0]
room.name.toLowerCase().contains(roomSearch)))) { .toLowerCase()
.contains(roomSearch))))) ||
(r.name != null && r.name.toLowerCase().contains(roomSearch))) {
ret.add({ ret.add({
'type': 'room', 'type': 'room',
'mxid': (r.canonicalAlias != null && r.canonicalAlias.isNotEmpty) 'mxid': (r.canonicalAlias != null && r.canonicalAlias.isNotEmpty)