forgot to ctrl+s

This commit is contained in:
Sorunome 2020-07-24 15:37:40 +02:00
parent 9cb4dab9d4
commit d4818bd677
No known key found for this signature in database
GPG key ID: B19471D07FC9BE9C

View file

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