GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-27 23:09:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'td/suggestions_fix' into 'main'

Browse Source 
fix: suggestions menu and use empty map in html messages null return

See merge request famedly/fluffychat!705
This commit is contained in:
Krille Fear 2022-02-02 07:55:38 +00:00
commit dfa58cfe05
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pages/chat/events/html_message.dart
View File

@ -95,7 +95,7 @@ class HtmlMessage extends StatelessWidget {
final identityParts = url.parseIdentifierIntoParts(); final identityParts = url.parseIdentifierIntoParts();
final identifier = identityParts?.primaryIdentifier; final identifier = identityParts?.primaryIdentifier;
if (identifier == null) { if (identifier == null) {
return {'': null}; return {};
} }
if (identifier.sigil == '@') { if (identifier.sigil == '@') {
// we have a user pill // we have a user pill
@ -127,13 +127,13 @@ class HtmlMessage extends StatelessWidget {
}; };
} }
} }
return {'': null}; return {};
} }
if (identifier.sigil == '!') { if (identifier.sigil == '!') {
// we have a room ID pill // we have a room ID pill
final r = room.client.getRoomById(identifier); final r = room.client.getRoomById(identifier);
if (r == null) { if (r == null) {
return {'': null}; return {};
} }
return { return {
'displayname': 'displayname':
@ -141,7 +141,7 @@ class HtmlMessage extends StatelessWidget {
'avatar_url': r.getState('m.room.avatar')?.content['url'], 'avatar_url': r.getState('m.room.avatar')?.content['url'],
}; };
} }
return {'': null}; return {};
}, },
); );
} }

2
lib/pages/chat/input_bar.dart
View File

@ -49,7 +49,7 @@ class InputBar extends StatelessWidget {
} }
final searchText = final searchText =
controller!.text.substring(0, controller!.selection.baseOffset); controller!.text.substring(0, controller!.selection.baseOffset);
final List<Map<String, String?>> ret = <Map<String, String>>[]; final List<Map<String, String?>> ret = <Map<String, String?>>[];
const maxResults = 30; const maxResults = 30;
final commandMatch = RegExp(r'^\/([\w]*)$').firstMatch(searchText); final commandMatch = RegExp(r'^\/([\w]*)$').firstMatch(searchText);