Skip to content

Commit f4985cc

Browse files
committed
feat: keep groupPk/secKey in metagroup for debugging purposes if needed
1 parent 50b9a31 commit f4985cc

File tree

5 files changed

+17
-28
lines changed

5 files changed

+17
-28
lines changed

.yarnrc.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
nodeLinker: node-modules
2-
patchFolder: patches
2+
3+
patchFolder: patches

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ if(NOT N EQUAL 0)
1616
else()
1717
set(CMAKE_BUILD_PARALLEL_LEVEL 4) # Fallback to 16 if detection fails
1818
endif()
19-
# set(CMAKE_BUILD_PARALLEL_LEVEL 32)
2019
message(STATUS "Number of processors detected: ${N}")
2120

2221

src/groups/meta_group.hpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,20 @@ class MetaGroup {
2525
shared_ptr<config::groups::Info> info;
2626
shared_ptr<config::groups::Members> members;
2727
shared_ptr<config::groups::Keys> keys;
28+
string edGroupPubKey;
29+
std::optional<string> edGroupSecKey;
2830

2931
MetaGroup(
3032
shared_ptr<config::groups::Info> info,
3133
shared_ptr<config::groups::Members> members,
32-
shared_ptr<config::groups::Keys> keys) :
33-
info{info}, members{members}, keys{keys} {};
34+
shared_ptr<config::groups::Keys> keys,
35+
session::ustring edGroupPubKey,
36+
std::optional<session::ustring> edGroupSecKey) :
37+
info{info}, members{members}, keys{keys} {
38+
39+
this->edGroupPubKey = oxenc::to_hex(edGroupPubKey);
40+
this->edGroupSecKey = edGroupSecKey ? oxenc::to_hex(*edGroupSecKey) : nullptr;
41+
};
3442

3543
explicit MetaGroup(const Napi::CallbackInfo& info) {}
3644
};

src/groups/meta_group_wrapper.cpp

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -469,32 +469,13 @@ Napi::Value MetaGroupWrapper::memberSetInvited(const Napi::CallbackInfo& info) {
469469
assertIsBoolean(info[1]);
470470
auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
471471
auto failed = toCppBoolean(info[1], __PRETTY_FUNCTION__);
472-
auto m = this->meta_group->members->get_or_construct(pubkeyHex);
473472

474-
// this->meta_group->members->log(
475-
// session::config::LogLevel::warning,
476-
// "libsession-util before: needsDump? " +
477-
// std::string(this->needsDump(info) ? "true" : "false"));
478-
// this->meta_group->members->log(
479-
// session::config::LogLevel::warning,
480-
// "libsession-util before: invite_failed of " + std::string(pubkeyHex) +
481-
// " val: " + std::string(m.invite_failed() ? "true" : "false"));
473+
auto m = this->meta_group->members->get_or_construct(pubkeyHex);
482474
m.set_invited(failed);
483475
this->meta_group->members->set(m);
484-
// this->meta_group->members->log(
485-
// session::config::LogLevel::warning,
486-
// "libsession-util after: invite_failed of " + std::string(pubkeyHex) +
487-
// " val: " + std::string(m.invite_failed() ? "true" : "false"));
488-
auto refreshed = this->meta_group->members->get_or_construct(m.session_id);
489-
// this->meta_group->members->log(
490-
// session::config::LogLevel::warning,
491-
// "libsession-util refreshed: invite_failed of " + std::string(pubkeyHex) +
492-
// " val: " + std::string(refreshed.invite_failed() ? "true" : "false"));
493-
// this->meta_group->members->log(
494-
// session::config::LogLevel::warning,
495-
// "libsession-util after: needsDump? of " +
496-
// std::string(this->needsDump(info) ? "true" : "false"));
497-
return refreshed;
476+
477+
return this->meta_group->members->get_or_construct(pubkeyHex);
478+
498479
});
499480
}
500481

src/meta/meta_base_wrapper.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class MetaBaseWrapper {
101101
*info,
102102
*members);
103103

104-
return std::make_unique<session::nodeapi::MetaGroup>(info, members, keys);
104+
return std::make_unique<session::nodeapi::MetaGroup>(info, members, keys,group_ed25519_pubkey, group_ed25519_secretkey);
105105
});
106106
}
107107
};

0 commit comments

Comments
 (0)