summary refs log tree commit diff
path: root/src/ui
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-04-19 11:20:34 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2021-04-19 11:20:52 +0200
commitd6109b95fb979bb53baf4a2b71dcce822c9feaf6 (patch)
tree0c9f16fd69790d7a303ec5800fee1ed30b82edc0 /src/ui
parentBump version to 0.8.2 (diff)
downloadnheko-d6109b95fb979bb53baf4a2b71dcce822c9feaf6.tar.xz
Escape html in topics and show line breaks in the settings
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/RoomSettings.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ui/RoomSettings.cpp b/src/ui/RoomSettings.cpp
index cb82cc4e..0bc8759e 100644
--- a/src/ui/RoomSettings.cpp
+++ b/src/ui/RoomSettings.cpp
@@ -227,13 +227,14 @@ RoomSettings::RoomSettings(QString roomid, QObject *parent)
 QString
 RoomSettings::roomName() const
 {
-        return QString::fromStdString(info_.name);
+        return utils::replaceEmoji(QString::fromStdString(info_.name).toHtmlEscaped());
 }
 
 QString
 RoomSettings::roomTopic() const
 {
-        return utils::linkifyMessage(QString::fromStdString(info_.topic).toHtmlEscaped());
+        return utils::replaceEmoji(utils::linkifyMessage(
+          QString::fromStdString(info_.topic).toHtmlEscaped().replace("\n", "<br>")));
 }
 
 QString