Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

smaller contact frag fixes

Browse Source
This commit is contained in:
Green Sky 2024-02-28 23:49:32 +01:00
parent 89f065a610
commit 6a6de77ae9
No known key found for this signature in database
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/fragment_store/message_fragment_store.cpp
View File

@ -174,6 +174,12 @@ void MessageFragmentStore::handleMessage(const Message3Handle& m) {
// assuming ts range exists // assuming ts range exists
fts_comp.begin = msg_ts; // extend into the past fts_comp.begin = msg_ts; // extend into the past
if (m.registry()->ctx().contains<Message::Components::ContactFragments>()) {
// should be the case
m.registry()->ctx().get<Message::Components::ContactFragments>().erase(fh);
m.registry()->ctx().get<Message::Components::ContactFragments>().insert(fh);
}
// TODO: check conditions for open here // TODO: check conditions for open here
// TODO: mark msg (and frag?) dirty // TODO: mark msg (and frag?) dirty
@ -185,6 +191,12 @@ void MessageFragmentStore::handleMessage(const Message3Handle& m) {
// assuming ts range exists // assuming ts range exists
fts_comp.end = msg_ts; // extend into the future fts_comp.end = msg_ts; // extend into the future
if (m.registry()->ctx().contains<Message::Components::ContactFragments>()) {
// should be the case
m.registry()->ctx().get<Message::Components::ContactFragments>().erase(fh);
m.registry()->ctx().get<Message::Components::ContactFragments>().insert(fh);
}
// TODO: check conditions for open here // TODO: check conditions for open here
// TODO: mark msg (and frag?) dirty // TODO: mark msg (and frag?) dirty
} }
@ -209,6 +221,15 @@ void MessageFragmentStore::handleMessage(const Message3Handle& m) {
new_ts_range.begin = msg_ts; new_ts_range.begin = msg_ts;
new_ts_range.end = msg_ts; new_ts_range.end = msg_ts;
{
const auto msg_reg_contact = m.registry()->ctx().get<Contact3>();
if (_cr.all_of<Contact::Components::ID>(msg_reg_contact)) {
fh.emplace<FragComp::MessagesContact>(_cr.get<Contact::Components::ID>(msg_reg_contact).data);
} else {
// ? rage quit?
}
}
// contact frag // contact frag
if (!m.registry()->ctx().contains<Message::Components::ContactFragments>()) { if (!m.registry()->ctx().contains<Message::Components::ContactFragments>()) {
m.registry()->ctx().emplace<Message::Components::ContactFragments>(); m.registry()->ctx().emplace<Message::Components::ContactFragments>();
@ -221,15 +242,6 @@ void MessageFragmentStore::handleMessage(const Message3Handle& m) {
} }
m.registry()->ctx().get<Message::Components::LoadedContactFragments>().frags.emplace(fh); m.registry()->ctx().get<Message::Components::LoadedContactFragments>().frags.emplace(fh);
{
const auto msg_reg_contact = m.registry()->ctx().get<Contact3>();
if (_cr.all_of<Contact::Components::ID>(msg_reg_contact)) {
fh.emplace<FragComp::MessagesContact>(_cr.get<Contact::Components::ID>(msg_reg_contact).data);
} else {
// ? rage quit?
}
}
fuid_open.emplace_back(Message::Components::OpenFragments::OpenFrag{fragment_uid}); fuid_open.emplace_back(Message::Components::OpenFragments::OpenFrag{fragment_uid});
std::cout << "MFS: created new fragment " << bin2hex(fragment_uid) << "\n"; std::cout << "MFS: created new fragment " << bin2hex(fragment_uid) << "\n";
@ -887,6 +899,7 @@ bool MessageFragmentStore::onEvent(const Fragment::Events::FragmentConstruct& e)
if (!msg_reg->ctx().contains<Message::Components::ContactFragments>()) { if (!msg_reg->ctx().contains<Message::Components::ContactFragments>()) {
msg_reg->ctx().emplace<Message::Components::ContactFragments>(); msg_reg->ctx().emplace<Message::Components::ContactFragments>();
} }
msg_reg->ctx().get<Message::Components::ContactFragments>().erase(e.e); // TODO: check/update/fragment update
msg_reg->ctx().get<Message::Components::ContactFragments>().insert(e.e); msg_reg->ctx().get<Message::Components::ContactFragments>().insert(e.e);
_event_check_queue.push(ECQueueEntry{e.e, frag_contact}); _event_check_queue.push(ECQueueEntry{e.e, frag_contact});