Escape html in topics and show line breaks in the settings

This commit is contained in:
Nicolas Werner 2021-04-19 11:20:34 +02:00
parent a792ea1465
commit d6109b95fb
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
4 changed files with 17 additions and 9 deletions

View file

@ -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