thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Escape html in topics and show line breaks in the settings

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

13
src/timeline/TimelineModel.cpp
View file

@ -474,9 +474,13 @@ TimelineModel::data(const mtx::events::collections::TimelineEvents &event, int r
case RoomId:
return QVariant(room_id_);
case RoomName:
return QVariant(QString::fromStdString(room_name(event)));
return QVariant(
utils::replaceEmoji(QString::fromStdString(room_name(event)).toHtmlEscaped()));
case RoomTopic:
return QVariant(QString::fromStdString(room_topic(event)));
return QVariant(utils::replaceEmoji(
utils::linkifyMessage(QString::fromStdString(room_topic(event))
.toHtmlEscaped()
.replace("\n", "<br>"))));
case CallType:
return QVariant(QString::fromStdString(call_type(event)));
case Dump: {
@ -1633,7 +1637,8 @@ TimelineModel::roomName() const
if (!info.count(room_id_))
return "";
else
return QString::fromStdString(info[room_id_].name);
return utils::replaceEmoji(
QString::fromStdString(info[room_id_].name).toHtmlEscaped());
}
QString
@ -1656,5 +1661,5 @@ TimelineModel::roomTopic() const
return "";
else
return utils::replaceEmoji(utils::linkifyMessage(
utils::escapeBlacklistedHtml(QString::fromStdString(info[room_id_].topic))));
QString::fromStdString(info[room_id_].topic).toHtmlEscaped()));
}