rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix display name referenced for incorrect event types

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