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

minor cleanup

Browse Source
This commit is contained in:
Green Sky 2024-10-06 11:52:17 +02:00
parent 8f8b907fe6
commit 2e34ad2100
No known key found for this signature in database
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solanaceae/tox_contacts/tox_contact_model2.cpp
View File

@ -304,7 +304,6 @@ Contact3Handle ToxContactModel2::getContactGroupPeer(uint32_t group_number, uint
// first check contacts with peer id // first check contacts with peer id
// TODO: lookup table // TODO: lookup table
//_cr.view<Contact::Components::ToxGroupPeerEphemeral>().each([&c, group_number, peer_number](const Contact3 e, const Contact::Components::ToxGroupPeerEphemeral& p_comp) {
for (const auto e : _cr.view<Contact::Components::ToxGroupPeerEphemeral>()) { for (const auto e : _cr.view<Contact::Components::ToxGroupPeerEphemeral>()) {
const auto& p_comp = _cr.get<Contact::Components::ToxGroupPeerEphemeral>(e); const auto& p_comp = _cr.get<Contact::Components::ToxGroupPeerEphemeral>(e);
if (p_comp.group_number == group_number && p_comp.peer_number == peer_number) { if (p_comp.group_number == group_number && p_comp.peer_number == peer_number) {
@ -321,7 +320,6 @@ Contact3Handle ToxContactModel2::getContactGroupPeer(uint32_t group_number, uint
// else check by key // else check by key
auto [g_p_key_opt, _] = _t.toxGroupPeerGetPublicKey(group_number, peer_number); auto [g_p_key_opt, _] = _t.toxGroupPeerGetPublicKey(group_number, peer_number);
//assert(g_p_key_opt.has_value()); // TODO: handle gracefully?
if (!g_p_key_opt.has_value()) { if (!g_p_key_opt.has_value()) {
// if the key could not be retreived, that means the peer has exited (idk why the earlier search did not work, it should have) // if the key could not be retreived, that means the peer has exited (idk why the earlier search did not work, it should have)
// also exit here, to not create, pubkey less <.< // also exit here, to not create, pubkey less <.<
@ -330,7 +328,6 @@ Contact3Handle ToxContactModel2::getContactGroupPeer(uint32_t group_number, uint
} }
const ToxKey& g_p_key = g_p_key_opt.value(); const ToxKey& g_p_key = g_p_key_opt.value();
//_cr.view<Contact::Components::ToxGroupPeerPersistent>().each([&c, &g_key, &g_p_key](const Contact3 e, const Contact::Components::ToxGroupPeerPersistent& g_p_key_comp) {
for (const auto e : _cr.view<Contact::Components::ToxGroupPeerPersistent>()) { for (const auto e : _cr.view<Contact::Components::ToxGroupPeerPersistent>()) {
const auto& g_p_key_comp = _cr.get<Contact::Components::ToxGroupPeerPersistent>(e); const auto& g_p_key_comp = _cr.get<Contact::Components::ToxGroupPeerPersistent>(e);
if (g_p_key == g_p_key_comp.peer_key && g_key == g_p_key_comp.chat_id) { if (g_p_key == g_p_key_comp.peer_key && g_key == g_p_key_comp.chat_id) {