diff --git a/resources/icons/ui/trash.svg b/resources/icons/ui/trash.svg deleted file mode 100644 index 18f52c5f0cee4e3218e06cdd73a2b64b96a40983..0000000000000000000000000000000000000000 --- a/resources/icons/ui/trash.svg +++ /dev/null @@ -1 +0,0 @@ -<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 diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml index f0a1d9578d3ea503a0f79572930d2b14999ac41c..dea5593807a5db81ab55fd56c6b6c5f1088e266f 100644 --- a/resources/qml/delegates/MessageDelegate.qml +++ b/resources/qml/delegates/MessageDelegate.qml @@ -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 diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index ab461c0825f045527085bd4f7d3ca901a67360d1..6f7646c7b4d7e9b48dfd66fb51838da34bdced18 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -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()) {