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

Fix redaction of edited messages

Browse source
This commit is contained in:
Nicolas Werner 2021-11-08 19:32:14 +01:00
parent b3ff70fee9
commit c4c13a1da9
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
4 changed files with 38 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/timeline/TimelineModel.cpp
View file

@ -344,6 +344,19 @@ TimelineModel::TimelineModel(TimelineViewManager *manager, QString room_id, QObj
[](const QString &msg) { emit ChatPage::instance()->showNotification(msg); },
Qt::QueuedConnection);
connect(this, &TimelineModel::dataAtIdChanged, this, [this](QString id) {
relatedEventCacheBuster++;
auto idx = idToIndex(id);
if (idx != -1) {
auto pos = index(idx);
nhlog::ui()->debug("data changed at {}", id.toStdString());
emit dataChanged(pos, pos);
} else {
nhlog::ui()->debug("id not found {}", id.toStdString());
}
});
connect(this,
&TimelineModel::newMessageToSend,
this,
@ -1095,7 +1108,8 @@ TimelineModel::showReadReceipts(QString id)
void
TimelineModel::redactEvent(QString id)
{
if (!id.isEmpty())
if (!id.isEmpty()) {
auto edits = events.edits(id.toStdString());
http::client()->redact_event(
room_id_.toStdString(),
id.toStdString(),
@ -1106,8 +1120,26 @@ TimelineModel::redactEvent(QString id)
return;
}
emit eventRedacted(id);
emit dataAtIdChanged(id);
});
// redact all edits to prevent leaks
for (const auto &e : edits) {
auto id_ = mtx::accessors::event_id(e);
http::client()->redact_event(
room_id_.toStdString(),
id_,
[this, id, id_](const mtx::responses::EventId &, mtx::http::RequestErr err) {
if (err) {
emit redactionFailed(tr("Message redaction failed: %1")
.arg(QString::fromStdString(err->matrix_error.error)));
return;
}
emit dataAtIdChanged(id);
});
}
}
}
int