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

Revert "Switch to newDisplayName() and newAvatarUrl()"

Browse Source 
This reverts commit a1b66f3aa6.
This commit is contained in:
Tobias Fella
2021-02-16 21:23:14 +01:00
committed by Carl Schwan
parent 2558e1f6b5
commit cc2b183fc5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/neochatroom.cpp
View File

@@ -400,17 +400,17 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
}
// Part 2: profile changes of joined members
if (e.isRename() && NeoChatConfig::self()->showRename()) {
if (!e.newDisplayName().has_value()) {
if (!e.displayName().isEmpty()) {
text = i18n("cleared their display name");
} else {
text = i18n("changed their display name to %1", e.newDisplayName()->toHtmlEscaped());
text = i18n("changed their display name to %1", e.displayName().toHtmlEscaped());
}
}
if (e.isAvatarUpdate() && NeoChatConfig::self()->showAvatarUpdate()) {
if (!text.isEmpty()) {
text += i18n(" and ");
}
if (!e.newAvatarUrl().has_value()) {
if (e.avatarUrl().isEmpty()) {
text += i18n("cleared their avatar");
} else if (e.prevContent()->avatarUrl.isEmpty()) {
text += i18n("set an avatar");