OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: tryGet for room account data

This commit is contained in:
Lukas Lihotzki 2021-08-09 11:12:49 +02:00
parent f91f662c75
commit 0b531d3e99
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/src/room.dart
View File

@ -482,6 +482,18 @@ class Room {
tag, tag,
); );
// Tag is part of client-to-server-API, so it uses strict parsing.
// For roomAccountData, permissive parsing is more suitable,
// so it is implemented here.
static Tag _tryTagFromJson(Object o) {
if (o is Map<String, dynamic>) {
return Tag(
order: o.tryGet<num>('order').toDouble(),
additionalProperties: Map.from(o)..remove('order'));
}
return Tag();
}
/// Returns all tags for this room. /// Returns all tags for this room.
Map<String, Tag> get tags { Map<String, Tag> get tags {
if (roomAccountData['m.tag'] == null || if (roomAccountData['m.tag'] == null ||
@ -489,7 +501,7 @@ class Room {
return {}; return {};
} }
final tags = (roomAccountData['m.tag'].content['tags'] as Map) final tags = (roomAccountData['m.tag'].content['tags'] as Map)
.map((k, v) => MapEntry<String, Tag>(k, Tag.fromJson(v))); .map((k, v) => MapEntry<String, Tag>(k, _tryTagFromJson(v)));
tags.removeWhere((k, v) => !TagType.isValid(k)); tags.removeWhere((k, v) => !TagType.isValid(k));
return tags; return tags;
} }