diff --git a/solanaceae/tox_messages/components.hpp b/solanaceae/tox_messages/components.hpp index ba0b9fd..cbea3bf 100644 --- a/solanaceae/tox_messages/components.hpp +++ b/solanaceae/tox_messages/components.hpp @@ -15,10 +15,6 @@ struct ToxGroupMessageID { // TODO: move all those comps -struct SyncedBy { - std::set list; -}; - namespace Transfer { struct ToxTransferFriend { diff --git a/solanaceae/tox_messages/components_id.inl b/solanaceae/tox_messages/components_id.inl index c700e27..382166d 100644 --- a/solanaceae/tox_messages/components_id.inl +++ b/solanaceae/tox_messages/components_id.inl @@ -13,7 +13,6 @@ constexpr entt::id_type entt::type_hash::value() noexcept { \ // cross compile(r) stable ids DEFINE_COMP_ID(Message::Components::ToxGroupMessageID) -DEFINE_COMP_ID(Message::Components::SyncedBy) DEFINE_COMP_ID(Message::Components::Transfer::ToxTransferFriend) DEFINE_COMP_ID(Message::Components::Transfer::FileID) DEFINE_COMP_ID(Message::Components::Transfer::FileKind) diff --git a/solanaceae/tox_messages/tox_message_manager.cpp b/solanaceae/tox_messages/tox_message_manager.cpp index ed07016..cc7b31e 100644 --- a/solanaceae/tox_messages/tox_message_manager.cpp +++ b/solanaceae/tox_messages/tox_message_manager.cpp @@ -128,8 +128,7 @@ bool ToxMessageManager::sendText(const Contact3 c, std::string_view message, boo reg.emplace(new_msg_e, message_id_opt.value()); // TODO: generalize? - auto& synced_by = reg.emplace(new_msg_e).list; - synced_by.emplace(c_self); + reg.emplace(new_msg_e).ts.emplace(c_self, ts); } } else if ( // non online group @@ -140,8 +139,7 @@ bool ToxMessageManager::sendText(const Contact3 c, std::string_view message, boo reg.emplace(new_msg_e, msg_id); // TODO: generalize? - auto& synced_by = reg.emplace(new_msg_e).list; - synced_by.emplace(c_self); + reg.emplace(new_msg_e).ts.emplace(c_self, ts); } else if ( _cr.any_of(c) ) { @@ -256,8 +254,7 @@ bool ToxMessageManager::onToxEvent(const Tox_Event_Group_Message* e) { reg.emplace(new_msg_e); { // by whom - auto& synced_by = reg.get_or_emplace(new_msg_e).list; - synced_by.emplace(self_c); + reg.get_or_emplace(new_msg_e).ts.emplace(self_c, ts); } _rmm.throwEventConstruct(reg, new_msg_e);