ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't show banned user as sender for state events

Browse Source 
BUG: 461158
This commit is contained in:
Tobias Fella
2022-10-31 16:10:09 +01:00
parent 66fadd78a3
commit 08300b994c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/messageeventmodel.cpp
View File

@@ -842,7 +842,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
} }
if (role == AuthorDisplayNameRole) { if (role == AuthorDisplayNameRole) {
if (!evt.unsignedJson()["prev_content"]["displayname"].isNull()) { if (is<RoomMemberEvent>(evt) && !evt.unsignedJson()["prev_content"]["displayname"].isNull() && evt.stateKey() == evt.senderId()) {
auto previousDisplayName = evt.unsignedJson()["prev_content"]["displayname"].toString().toHtmlEscaped(); auto previousDisplayName = evt.unsignedJson()["prev_content"]["displayname"].toString().toHtmlEscaped();
if (previousDisplayName.isEmpty()) { if (previousDisplayName.isEmpty()) {
previousDisplayName = evt.senderId(); previousDisplayName = evt.senderId();
@@ -850,7 +850,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
return previousDisplayName; return previousDisplayName;
} else { } else {
auto author = static_cast<NeoChatUser *>(isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId())); auto author = static_cast<NeoChatUser *>(isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId()));
m_currentRoom->htmlSafeMemberName(author->id()); return m_currentRoom->htmlSafeMemberName(author->id());
} }
} }