Skip to content

Commit 73ca422

Browse files
asabri97asabri97
committed
refactor: event-getter
1 parent 5fe0866 commit 73ca422

File tree

2 files changed

+134
-138
lines changed

2 files changed

+134
-138
lines changed

‎lib/msc_extensions/msc_1236_widgets/src/widget.dart‎

Lines changed: 134 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,134 @@
1-
import 'package:matrix/src/room.dart';
2-
3-
class MatrixWidget {
4-
final Room room;
5-
final String? creatorUserId;
6-
final Map<String, dynamic>? data;
7-
final String? id;
8-
final String? name;
9-
final String type;
10-
11-
/// use [buildWidgetUrl] instead
12-
final String url;
13-
final bool waitForIframeLoad;
14-
15-
MatrixWidget({
16-
required this.room,
17-
this.creatorUserId,
18-
this.data = const {},
19-
this.id,
20-
required this.name,
21-
required this.type,
22-
required this.url,
23-
this.waitForIframeLoad = false,
24-
});
25-
26-
factory MatrixWidget.fromJson(Map<String, dynamic> json, Room room) =>
27-
MatrixWidget(
28-
room: room,
29-
creatorUserId:
30-
json.containsKey('creatorUserId') ? json['creatorUserId'] : null,
31-
data: json.containsKey('data') ? json['data'] : {},
32-
id: json.containsKey('id') ? json['id'] : null,
33-
name: json['name'],
34-
type: json['type'],
35-
url: json['url'],
36-
waitForIframeLoad: json.containsKey('waitForIframeLoad')
37-
? json['waitForIframeLoad']
38-
: false,
39-
);
40-
41-
/// creates an `m.etherpad` [MatrixWidget]
42-
factory MatrixWidget.etherpad(Room room, String name, Uri url) =>
43-
MatrixWidget(
44-
room: room,
45-
name: name,
46-
type: 'm.etherpad',
47-
url: url.toString(),
48-
data: {
49-
'url': url.toString(),
50-
},
51-
);
52-
53-
/// creates an `m.jitsi` [MatrixWidget]
54-
factory MatrixWidget.jitsi(
55-
Room room,
56-
String name,
57-
Uri url, {
58-
bool isAudioOnly = false,
59-
}) =>
60-
MatrixWidget(
61-
room: room,
62-
name: name,
63-
type: 'm.jitsi',
64-
url: url.toString(),
65-
data: {
66-
'domain': url.host,
67-
'conferenceId': url.pathSegments.last,
68-
'isAudioOnly': isAudioOnly,
69-
},
70-
);
71-
72-
/// creates an `m.video` [MatrixWidget]
73-
factory MatrixWidget.video(Room room, String name, Uri url) => MatrixWidget(
74-
room: room,
75-
name: name,
76-
type: 'm.video',
77-
url: url.toString(),
78-
data: {
79-
'url': url.toString(),
80-
},
81-
);
82-
83-
/// creates an `m.custom` [MatrixWidget]
84-
factory MatrixWidget.custom(Room room, String name, Uri url) => MatrixWidget(
85-
room: room,
86-
name: name,
87-
type: 'm.custom',
88-
url: url.toString(),
89-
data: {
90-
'url': url.toString(),
91-
},
92-
);
93-
94-
Future<Uri> buildWidgetUrl() async {
95-
// See https://github.com/matrix-org/matrix-doc/issues/1236 for a
96-
// description, specifically the section
97-
// `What does the other stuff in content mean?`
98-
final userProfile = await room.client.getUserProfile(room.client.userID!);
99-
var parsedUri = url;
100-
101-
// a key-value map with the strings to be replaced
102-
final replaceMap = {
103-
r'$matrix_user_id': room.client.userID!,
104-
r'$matrix_room_id': room.id,
105-
r'$matrix_display_name': userProfile.displayname ?? '',
106-
r'$matrix_avatar_url': userProfile.avatarUrl?.toString() ?? '',
107-
// removing potentially dangerous keys containing anything but
108-
// `[a-zA-Z0-9_-]` as well as non string values
109-
if (data != null)
110-
...Map.from(data!)
111-
..removeWhere(
112-
(key, value) =>
113-
!RegExp(r'^[\w-]+$').hasMatch(key) || !value is String,
114-
)
115-
..map((key, value) => MapEntry('\$key', value)),
116-
};
117-
118-
replaceMap.forEach((key, value) {
119-
parsedUri = parsedUri.replaceAll(key, Uri.encodeComponent(value));
120-
});
121-
122-
return Uri.parse(parsedUri);
123-
}
124-
125-
Map<String, dynamic> toJson() => {
126-
'creatorUserId': creatorUserId,
127-
'data': data,
128-
'id': id,
129-
'name': name,
130-
'type': type,
131-
'url': url,
132-
'waitForIframeLoad': waitForIframeLoad,
133-
};
134-
}
1+
import 'package:matrix/src/room.dart';
2+
3+
class MatrixWidget {
4+
final Room room;
5+
final String? creatorUserId;
6+
final Map<String, dynamic>? data;
7+
final String? id;
8+
final String? name;
9+
final String type;
10+
11+
/// use [buildWidgetUrl] instead
12+
final String url;
13+
final bool waitForIframeLoad;
14+
15+
MatrixWidget({
16+
required this.room,
17+
this.creatorUserId,
18+
this.data = const {},
19+
this.id,
20+
required this.name,
21+
required this.type,
22+
required this.url,
23+
this.waitForIframeLoad = false,
24+
});
25+
26+
factory MatrixWidget.fromJson(Map<String, dynamic> json, Room room) =>
27+
MatrixWidget(
28+
room: room,
29+
creatorUserId:
30+
json.containsKey('creatorUserId') ? json['creatorUserId'] : null,
31+
data: json.containsKey('data') ? json['data'] : {},
32+
id: json.containsKey('id') ? json['id'] : null,
33+
name: json['name'],
34+
type: json['type'],
35+
url: json['url'],
36+
waitForIframeLoad: json.containsKey('waitForIframeLoad')
37+
? json['waitForIframeLoad']
38+
: false,
39+
);
40+
41+
/// creates an `m.etherpad` [MatrixWidget]
42+
factory MatrixWidget.etherpad(Room room, String name, Uri url) =>
43+
MatrixWidget(
44+
room: room,
45+
name: name,
46+
type: 'm.etherpad',
47+
url: url.toString(),
48+
data: {
49+
'url': url.toString(),
50+
},
51+
);
52+
53+
/// creates an `m.jitsi` [MatrixWidget]
54+
factory MatrixWidget.jitsi(
55+
Room room,
56+
String name,
57+
Uri url, {
58+
bool isAudioOnly = false,
59+
}) =>
60+
MatrixWidget(
61+
room: room,
62+
name: name,
63+
type: 'm.jitsi',
64+
url: url.toString(),
65+
data: {
66+
'domain': url.host,
67+
'conferenceId': url.pathSegments.last,
68+
'isAudioOnly': isAudioOnly,
69+
},
70+
);
71+
72+
/// creates an `m.video` [MatrixWidget]
73+
factory MatrixWidget.video(Room room, String name, Uri url) => MatrixWidget(
74+
room: room,
75+
name: name,
76+
type: 'm.video',
77+
url: url.toString(),
78+
data: {
79+
'url': url.toString(),
80+
},
81+
);
82+
83+
/// creates an `m.custom` [MatrixWidget]
84+
factory MatrixWidget.custom(Room room, String name, Uri url) => MatrixWidget(
85+
room: room,
86+
name: name,
87+
type: 'm.custom',
88+
url: url.toString(),
89+
data: {
90+
'url': url.toString(),
91+
},
92+
);
93+
94+
Future<Uri> buildWidgetUrl() async {
95+
// See https://github.com/matrix-org/matrix-doc/issues/1236 for a
96+
// description, specifically the section
97+
// `What does the other stuff in content mean?`
98+
final userProfile = await room.client.getUserProfile(room.client.userID!);
99+
var parsedUri = url;
100+
101+
// a key-value map with the strings to be replaced
102+
final replaceMap = {
103+
r'$matrix_user_id': room.client.userID!,
104+
r'$matrix_room_id': room.id,
105+
r'$matrix_display_name': userProfile.displayname ?? '',
106+
r'$matrix_avatar_url': userProfile.avatarUrl?.toString() ?? '',
107+
// removing potentially dangerous keys containing anything but
108+
// `[a-zA-Z0-9_-]` as well as non string values
109+
if (data != null)
110+
...Map.from(data!)
111+
..removeWhere(
112+
(key, value) =>
113+
!RegExp(r'^[\w-]+$').hasMatch(key) || !value is String,
114+
)
115+
..map((key, value) => MapEntry('\$key', value)),
116+
};
117+
118+
replaceMap.forEach((key, value) {
119+
parsedUri = parsedUri.replaceAll(key, Uri.encodeComponent(value));
120+
});
121+
122+
return Uri.parse(parsedUri);
123+
}
124+
125+
Map<String, dynamic> toJson() => {
126+
'creatorUserId': creatorUserId,
127+
'data': data,
128+
'id': id,
129+
'name': name,
130+
'type': type,
131+
'url': url,
132+
'waitForIframeLoad': waitForIframeLoad,
133+
};
134+
}

‎test/webrtc_stub.dart‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -849,8 +849,4 @@ class MockVideoRenderer implements VideoRenderer {
849849
// Mock implementation for disposing VideoRenderer
850850
Logs().i('Mock: Disposing VideoRenderer');
851851
}
852-
853-
@override
854-
// TODO: implement videoValue
855-
RTCVideoValue get videoValue => throw UnimplementedError();
856852
}

0 commit comments

Comments
 (0)