d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-29 14:18:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix display name referenced for incorrect event types

Browse source
This commit is contained in:
Joseph Donofry 2021-04-18 15:32:28 -04:00
parent 01ee25cee4
commit a402e85a0f
No known key found for this signature in database
GPG key ID: E8A1D78EF044B0CB
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/timeline/TimelineModel.cpp
View file

@ -1463,9 +1463,8 @@ TimelineModel::formatMemberEvent(QString id)
} }
} }
QString user = QString::fromStdString(event->state_key); QString user = QString::fromStdString(event->state_key);
QString name = utils::replaceEmoji(displayName(user)); QString name = utils::replaceEmoji(displayName(user));
QString oldName = QString::fromStdString(prevEvent->content.display_name);
QString rendered; QString rendered;
// see table https://matrix.org/docs/spec/client_server/latest#m-room-member // see table https://matrix.org/docs/spec/client_server/latest#m-room-member
@ -1476,6 +1475,8 @@ TimelineModel::formatMemberEvent(QString id)
break; break;
case Membership::Join: case Membership::Join:
if (prevEvent && prevEvent->content.membership == Membership::Join) { if (prevEvent && prevEvent->content.membership == Membership::Join) {
QString oldName = QString::fromStdString(prevEvent->content.display_name);
bool displayNameChanged = bool displayNameChanged =
prevEvent->content.display_name != event->content.display_name; prevEvent->content.display_name != event->content.display_name;
bool avatarChanged = bool avatarChanged =