Green-Sky/tomato
Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

make empty contacts from ids on message load

Browse Source
This commit is contained in:
Green Sky 2024-02-19 15:11:32 +01:00
parent 6aac44cda9
commit 67c6f9adb0
No known key found for this signature in database
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/fragment_store/message_serializer.cpp
View File

@ -7,6 +7,17 @@
#include <iostream> #include <iostream>
static Contact3 findContactByID(Contact3Registry& cr, const std::vector<uint8_t>& id) {
// TODO: id lookup table, this is very inefficent
for (const auto& [c_it, id_it] : cr.view<Contact::Components::ID>().each()) {
if (id == id_it.data) {
return c_it;
}
}
return entt::null;
}
template<> template<>
bool MessageSerializerCallbacks::component_get_json<Message::Components::ContactFrom>(MessageSerializerCallbacks& msc, const Handle h, nlohmann::json& j) { bool MessageSerializerCallbacks::component_get_json<Message::Components::ContactFrom>(MessageSerializerCallbacks& msc, const Handle h, nlohmann::json& j) {
const Contact3 c = h.get<Message::Components::ContactFrom>().c; const Contact3 c = h.get<Message::Components::ContactFrom>().c;
@ -38,16 +49,17 @@ bool MessageSerializerCallbacks::component_emplace_or_replace_json<Message::Comp
const std::vector<uint8_t> id = j.is_binary()?j:j["bytes"]; const std::vector<uint8_t> id = j.is_binary()?j:j["bytes"];
// TODO: id lookup table, this is very inefficent Contact3 other_c = findContactByID(msc.cr, id);
for (const auto& [c_it, id_it] : msc.cr.view<Contact::Components::ID>().each()) { if (!msc.cr.valid(other_c)) {
if (id == id_it.data) { // create sparse contact with id only
h.emplace_or_replace<Message::Components::ContactFrom>(c_it); other_c = msc.cr.create();
return true; msc.cr.emplace_or_replace<Contact::Components::ID>(other_c, id);
}
} }
// TODO: should we really return false if the contact is unknown?? h.emplace_or_replace<Message::Components::ContactFrom>(other_c);
return false;
// TODO: should we return false if the contact is unknown??
return true;
} }
template<> template<>
@ -81,14 +93,15 @@ bool MessageSerializerCallbacks::component_emplace_or_replace_json<Message::Comp
const std::vector<uint8_t> id = j.is_binary()?j:j["bytes"]; const std::vector<uint8_t> id = j.is_binary()?j:j["bytes"];
// TODO: id lookup table, this is very inefficent Contact3 other_c = findContactByID(msc.cr, id);
for (const auto& [c_it, id_it] : msc.cr.view<Contact::Components::ID>().each()) { if (!msc.cr.valid(other_c)) {
if (id == id_it.data) { // create sparse contact with id only
h.emplace_or_replace<Message::Components::ContactTo>(c_it); other_c = msc.cr.create();
return true; msc.cr.emplace_or_replace<Contact::Components::ID>(other_c, id);
}
} }
// TODO: should we really return false if the contact is unknown?? h.emplace_or_replace<Message::Components::ContactTo>(other_c);
return false;
// TODO: should we return false if the contact is unknown??
return true;
} }