summary refs log tree commit diff
path: root/src/timeline/TimelineModel.cpp
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-09-09 21:20:34 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2021-09-09 21:20:34 +0200
commitf9a334233fa03e4705fb34a02fce9da8cd0dceb6 (patch)
tree0db234c070f4469655d602bae704b87322a90a4e /src/timeline/TimelineModel.cpp
parentFix day separator when loading older messages (diff)
downloadnheko-f9a334233fa03e4705fb34a02fce9da8cd0dceb6.tar.xz
Don't allow images in username change messages and user completer
Sorry, no fun for you!
Diffstat (limited to 'src/timeline/TimelineModel.cpp')
-rw-r--r--src/timeline/TimelineModel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp

index e5e9d9bf..78409e1d 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp
@@ -1858,7 +1858,8 @@ TimelineModel::formatMemberEvent(QString id) break; case Membership::Join: if (prevEvent && prevEvent->content.membership == Membership::Join) { - QString oldName = QString::fromStdString(prevEvent->content.display_name); + QString oldName = utils::replaceEmoji( + QString::fromStdString(prevEvent->content.display_name).toHtmlEscaped()); bool displayNameChanged = prevEvent->content.display_name != event->content.display_name;