GitLab
/
fluffychat
mirror of https://gitlab.com/famedly/fluffychat.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'soru/fix-room-suggestions' into 'main' 

fix: Suggest correct rooms

See merge request ChristianPauly/fluffychat-flutter!283
This commit is contained in:
Christian Pauly 2020-11-21 19:06:20 +00:00
parent 94231dab30 59ec9de8e8
commit 9022da9394
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/components/input_bar.dart
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)