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

Fix edited replies

Browse source
This commit is contained in:
Nicolas Werner 2021-01-27 16:14:03 +01:00
parent d6504812c7
commit faeaf9dc6b
3 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/timeline/EventStore.cpp
View file

@ -414,7 +414,8 @@ EventStore::edits(const std::string &event_id)
if (!original_event)
return {};
auto original_sender = mtx::accessors::sender(*original_event);
auto original_sender = mtx::accessors::sender(*original_event);
auto original_relations = mtx::accessors::relations(*original_event);
std::vector<mtx::events::collections::TimelineEvents> edits;
for (const auto &id : event_ids) {
@ -422,10 +423,20 @@ EventStore::edits(const std::string &event_id)
if (!related_event)
continue;
auto edit_rel = mtx::accessors::relations(*related_event);
auto related_ev = *related_event;
auto edit_rel = mtx::accessors::relations(related_ev);
if (edit_rel.replaces() == event_id &&
original_sender == mtx::accessors::sender(*related_event))
edits.push_back(*related_event);
original_sender == mtx::accessors::sender(related_ev)) {
if (edit_rel.synthesized && original_relations.reply_to() &&
!edit_rel.reply_to()) {
edit_rel.relations.push_back(
{mtx::common::RelationType::InReplyTo,
original_relations.reply_to().value()});
mtx::accessors::set_relations(related_ev, std::move(edit_rel));
}
edits.push_back(std::move(related_ev));
}
}
auto c = cache::client();