Skip to content
Snippets Groups Projects

Change QML UI for redactions

Merged Joe Donofry requested to merge redaction_updates into master
1 unresolved thread
@@ -1810,9 +1810,9 @@ TimelineModel::formatRedactedEvent(QString id)
if (!event)
return pair;
QString dateTime = QDateTime::fromMSecsSinceEpoch(event->origin_server_ts).toString();
QString reason = "";
auto because = event->unsigned_data.redacted_because;
QString dateTime = QDateTime::fromMSecsSinceEpoch(event->origin_server_ts).toString();
QString reason = "";
auto because = event->unsigned_data.redacted_because;
// User info about who actually sent the redacted event.
QString redactedUser = QString::fromStdString(because->sender).toHtmlEscaped();
QString redactedName = utils::replaceEmoji(displayName(redactedUser));
@@ -1823,11 +1823,12 @@ TimelineModel::formatRedactedEvent(QString id)
if (reason.isEmpty()) {
pair["first"] = tr("Removed by %1").arg(redactedName);
pair["second"] = tr("%1 (%2) removed this message at %3").arg(redactedName, redactedUser, dateTime);
pair["second"] =
tr("%1 (%2) removed this message at %3").arg(redactedName, redactedUser, dateTime);
} else {
pair["first"] = tr("Removed by %1 because: %2").arg(redactedName, reason);
pair["first"] = tr("Removed by %1 because: %2").arg(redactedName, reason);
pair["second"] = tr("%1 (%2) removed this message at %3\nReason: %4")
.arg(redactedName, redactedUser, dateTime, reason);
.arg(redactedName, redactedUser, dateTime, reason);
}
return pair;
Loading