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

Merge branch 'nico/widget-fix' into 'main' 

fix: exception on removed widgets

Closes #267

See merge request famedly/company/frontend/famedlysdk!956
This commit is contained in:
Krille Fear 2022-02-14 06:50:18 +00:00
parent c64e6b9c11 4a52540006
commit e11ec12a63
3 changed files with 64 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/src/room.dart
View File

@ -374,12 +374,13 @@ class Room {
List<MatrixWidget> get widgets => { List<MatrixWidget> get widgets => {
...states['m.widget'] ?? {}, ...states['m.widget'] ?? {},
...states['im.vector.modular.widgets'] ?? {}, ...states['im.vector.modular.widgets'] ?? {},
} }.values.expand((e) {
.values try {
.map( return [MatrixWidget.fromJson(e.content, this)];
(e) => MatrixWidget.fromJson(e.content, this), } catch (_) {
) return <MatrixWidget>[];
.toList(); }
}).toList();
/// Your current client instance. /// Your current client instance.
final Client client; final Client client;

2
lib/widget.dart
View File

@ -5,7 +5,7 @@ class MatrixWidget {
final String? creatorUserId; final String? creatorUserId;
final Map<String, dynamic>? data; final Map<String, dynamic>? data;
final String? id; final String? id;
final String name; final String? name;
final String type; final String type;
/// use [buildWidgetUrl] instead /// use [buildWidgetUrl] instead

56
test/room_test.dart
View File

@ -923,6 +923,62 @@ void main() {
test('Widgets', () { test('Widgets', () {
expect(room.widgets.isEmpty, true); expect(room.widgets.isEmpty, true);
room.states['m.widget'] = {
'test': Event.fromJson({
'content': {
'creatorUserId': '@rxl881:matrix.org',
'data': {'title': 'Bridges Dashboard', 'dateRange': '1y'},
'id': 'grafana_@rxl881:matrix.org_1514573757015',
'name': 'Grafana',
'type': 'm.grafana',
'url': 'https://matrix.org/grafana/whatever',
'waitForIframeLoad': true
},
'room_id': '!foo:bar',
'event_id': '\$15104760642668662QICBu:matrix.org',
'sender': '@rxl881:matrix.org',
'state_key': 'test',
'origin_server_ts': 1432735824653,
'type': 'm.widget'
}, room),
};
expect(room.widgets.length, 1);
room.states['m.widget'] = {
'test2': Event.fromJson({
'content': {
'creatorUserId': '@rxl881:matrix.org',
'data': {'title': 'Bridges Dashboard', 'dateRange': '1y'},
'id': 'grafana_@rxl881:matrix.org_1514573757016',
'type': 'm.grafana',
'url': 'https://matrix.org/grafana/whatever',
'waitForIframeLoad': true
},
'room_id': '!foo:bar',
'event_id': '\$15104760642668663QICBu:matrix.org',
'sender': '@rxl881:matrix.org',
'state_key': 'test2',
'origin_server_ts': 1432735824653,
'type': 'm.widget'
}, room),
};
expect(room.widgets.length, 1);
room.states['m.widget'] = {
'test3': Event.fromJson({
'content': {
'creatorUserId': '@rxl881:matrix.org',
'data': {'title': 'Bridges Dashboard', 'dateRange': '1y'},
'type': 'm.grafana',
'waitForIframeLoad': true
},
'room_id': '!foo:bar',
'event_id': '\$15104760642668662QICBu:matrix.org',
'sender': '@rxl881:matrix.org',
'state_key': 'test3',
'origin_server_ts': 1432735824655,
'type': 'm.widget'
}, room),
};
expect(room.widgets.length, 0);
}); });
test('Spaces', () async { test('Spaces', () async {