inex/famedlysdk
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'soru/test-web' into 'master'

Browse source 
test web

See merge request famedly/famedlysdk!395
This commit is contained in:
Sorunome 2020-07-24 13:00:12 +00:00
parent ad8135990d ff2de35d28
commit f90b8c81b1
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/matrix_api/model/matrix_event.dart
View file

@ -41,9 +41,10 @@ class MatrixEvent extends StrippedStateEvent {
unsigned = json['unsigned'] != null
? Map<String, dynamic>.from(json['unsigned'])
: null;
prevContent = json['prev_content'] != null
? Map<String, dynamic>.from(json['prev_content'])
: null;
prevContent =
json.containsKey('prev_content') && json['prev_content'] != null
? Map<String, dynamic>.from(json['prev_content'])
: null;
redacts = json['redacts'];
}

18
lib/src/event.dart
View file

@ -93,7 +93,9 @@ class Event extends MatrixEvent {
// into the unsigned block
this.prevContent = prevContent != null && prevContent.isNotEmpty
? prevContent
: (unsigned != null && unsigned['prev_content'] is Map
: (unsigned != null &&
unsigned.containsKey('prev_content') &&
unsigned['prev_content'] is Map
? unsigned['prev_content']
: null);
this.stateKey = stateKey;
@ -481,7 +483,8 @@ class Event extends MatrixEvent {
final targetName = stateKeyUser.calcDisplayname();
// Has the membership changed?
final newMembership = content['membership'] ?? '';
final oldMembership = unsigned['prev_content'] is Map<String, dynamic>
final oldMembership = unsigned.containsKey('prev_content') &&
unsigned['prev_content'] is Map<String, dynamic>
? unsigned['prev_content']['membership'] ?? ''
: '';
if (newMembership != oldMembership) {
@ -518,15 +521,16 @@ class Event extends MatrixEvent {
}
} else if (newMembership == 'join') {
final newAvatar = content['avatar_url'] ?? '';
final oldAvatar = unsigned['prev_content'] is Map<String, dynamic>
final oldAvatar = unsigned.containsKey('prev_content') &&
unsigned['prev_content'] is Map<String, dynamic>
? unsigned['prev_content']['avatar_url'] ?? ''
: '';
final newDisplayname = content['displayname'] ?? '';
final oldDisplayname =
unsigned['prev_content'] is Map<String, dynamic>
? unsigned['prev_content']['displayname'] ?? ''
: '';
final oldDisplayname = unsigned.containsKey('prev_content') &&
unsigned['prev_content'] is Map<String, dynamic>
? unsigned['prev_content']['displayname'] ?? ''
: '';
// Has the user avatar changed?
if (newAvatar != oldAvatar) {