rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix edited replies

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/EventAccessors.cpp
View File

@ -264,6 +264,20 @@ struct EventRelations
}
};
struct SetEventRelations
{
mtx::common::Relations new_relations;
template<class Content>
using related_ev_id_t = decltype(Content::relations);
template<class T>
void operator()(mtx::events::Event<T> &e)
{
if constexpr (is_detected<related_ev_id_t, T>::value) {
e.content.relations = std::move(new_relations);
}
}
};
struct EventTransactionId
{
template<class T>
@ -426,6 +440,13 @@ mtx::accessors::relations(const mtx::events::collections::TimelineEvents &event)
return std::visit(EventRelations{}, event);
}
void
mtx::accessors::set_relations(mtx::events::collections::TimelineEvents &event,
mtx::common::Relations relations)
{
std::visit(SetEventRelations{std::move(relations)}, event);
}
std::string
mtx::accessors::transaction_id(const mtx::events::collections::TimelineEvents &event)
{

2
src/EventAccessors.h
View File

@ -55,6 +55,8 @@ std::string
mimetype(const mtx::events::collections::TimelineEvents &event);
mtx::common::Relations
relations(const mtx::events::collections::TimelineEvents &event);
void
set_relations(mtx::events::collections::TimelineEvents &event, mtx::common::Relations relations);
std::string
transaction_id(const mtx::events::collections::TimelineEvents &event);

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();