This commit is contained in:
Sorunome 2020-07-24 15:44:55 +02:00
parent d4818bd677
commit 84a94f5c9d
No known key found for this signature in database
GPG key ID: B19471D07FC9BE9C

View file

@ -481,9 +481,10 @@ 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 != null && unsigned['prev_content'] is Map<String, dynamic> final oldMembership =
? unsigned['prev_content']['membership'] ?? '' unsigned != null && unsigned['prev_content'] is Map<String, dynamic>
: ''; ? unsigned['prev_content']['membership'] ?? ''
: '';
if (newMembership != oldMembership) { if (newMembership != oldMembership) {
if (oldMembership == 'invite' && newMembership == 'join') { if (oldMembership == 'invite' && newMembership == 'join') {
text = i18n.acceptedTheInvitation(targetName); text = i18n.acceptedTheInvitation(targetName);
@ -518,12 +519,14 @@ 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 != null && unsigned['prev_content'] is Map<String, dynamic> final oldAvatar = unsigned != null &&
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 != null && unsigned['prev_content'] is Map<String, dynamic> final oldDisplayname = unsigned != null &&
unsigned['prev_content'] is Map<String, dynamic>
? unsigned['prev_content']['displayname'] ?? '' ? unsigned['prev_content']['displayname'] ?? ''
: ''; : '';