Skip to content
Snippets Groups Projects
Verified Commit dc633e9c authored by Joe Donofry's avatar Joe Donofry
Browse files

Remove extra icon, fix html escaping

parent 34871cca
No related branches found
No related tags found
1 merge request!16Change QML UI for redactions
Pipeline #2151 passed
This commit is part of merge request !16. Comments created here will be created in the context of that merge request.
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M432 32H312l-9.4-18.7A24 24 0 0 0 281.1 0H166.8a23.72 23.72 0 0 0-21.4 13.3L136 32H16A16 16 0 0 0 0 48v32a16 16 0 0 0 16 16h416a16 16 0 0 0 16-16V48a16 16 0 0 0-16-16zM53.2 467a48 48 0 0 0 47.9 45h245.8a48 48 0 0 0 47.9-45L416 128H32z"/></svg>
\ No newline at end of file
......@@ -189,7 +189,7 @@ Item {
Label {
id: redactedLabel
Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
text: qsTr("removed")
text: qsTr("Removed")
ToolTip.text: room.formatRedactedEvent(eventId)
ToolTip.visible: ma.containsMouse
......
......@@ -1808,14 +1808,14 @@ TimelineModel::formatRedactedEvent(QString id)
if (!event)
return "";
QString user = QString::fromStdString(event->sender);
QString user = QString::fromStdString(event->sender).toHtmlEscaped();
QString name = utils::replaceEmoji(displayName(user));
QString dateTime = QDateTime::fromMSecsSinceEpoch(event->origin_server_ts).toString();
QString reason = "";
auto because = event->unsigned_data.redacted_because;
if (because.has_value()) {
reason = QString::fromStdString(because->content.reason);
reason = QString::fromStdString(because->content.reason).toHtmlEscaped();
}
if (reason.isEmpty()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment