diff --git a/src/groups/meta_group.hpp b/src/groups/meta_group.hpp index 231a931..a11d7be 100644 --- a/src/groups/meta_group.hpp +++ b/src/groups/meta_group.hpp @@ -34,13 +34,13 @@ class MetaGroup { shared_ptr keys, session::ustring edGroupPubKey, std::optional edGroupSecKey) : - info{info}, members{members}, keys{keys} { - - this->edGroupPubKey = oxenc::to_hex(edGroupPubKey); - this->edGroupSecKey = edGroupSecKey ? oxenc::to_hex(*edGroupSecKey) : nullptr; - }; - - explicit MetaGroup(const Napi::CallbackInfo& info) {} + info{info}, members{members}, keys{keys}, edGroupPubKey{oxenc::to_hex(edGroupPubKey)} { + + if (edGroupSecKey.has_value()) { + this->edGroupSecKey = oxenc::to_hex(*edGroupSecKey); + } else { + this->edGroupSecKey = std::nullopt; + } + } }; - -} // namespace session::nodeapi +} // namespace session::nodeapi \ No newline at end of file diff --git a/src/groups/meta_group_wrapper.cpp b/src/groups/meta_group_wrapper.cpp index bb45b97..925e0c9 100644 --- a/src/groups/meta_group_wrapper.cpp +++ b/src/groups/meta_group_wrapper.cpp @@ -11,32 +11,7 @@ namespace session::nodeapi { MetaGroupWrapper::MetaGroupWrapper(const Napi::CallbackInfo& info) : meta_group{std::move(MetaBaseWrapper::constructGroupWrapper(info, "MetaGroupWrapper"))}, - Napi::ObjectWrap{info} { - auto env = info.Env(); - // this->meta_group->members->logger = [env](session::config::LogLevel, std::string_view x) { - // std::string toLog = "libsession-util:MetaGroup:Member: " + std::string(x) + "\n"; - - // Napi::Function consoleLog = - // env.Global().Get("console").As().Get("log").As(); - // consoleLog.Call({Napi::String::New(env, toLog)}); - // }; - // this->meta_group->info->logger = [env](session::config::LogLevel, std::string_view x) { - // std::string toLog = "libsession-util:MetaGroup:Info: " + std::string(x) + "\n"; - - // Napi::Function consoleLog = - // env.Global().Get("console").As().Get("log").As(); - // consoleLog.Call({Napi::String::New(env, toLog)}); - // }; - // this->meta_group->keys->logger = [env]( - // session::config::LogLevel, - // std::string_view x) { - // std::string toLog = "libsession-util:MetaGroup:Keys: " + std::string(x) + "\n"; - - // Napi::Function consoleLog = - // env.Global().Get("console").As().Get("log").As(); - // consoleLog.Call({Napi::String::New(env, toLog)}); - // }; -} + Napi::ObjectWrap{info} {} void MetaGroupWrapper::Init(Napi::Env env, Napi::Object exports) { MetaBaseWrapper::NoBaseClassInitHelper( @@ -152,8 +127,6 @@ Napi::Value MetaGroupWrapper::needsDump(const Napi::CallbackInfo& info) { Napi::Value MetaGroupWrapper::metaDump(const Napi::CallbackInfo& info) { return wrapResult(info, [&] { - auto env = info.Env(); - oxenc::bt_dict_producer combined; // NOTE: the keys have to be in ascii-sorted order: @@ -168,8 +141,6 @@ Napi::Value MetaGroupWrapper::metaDump(const Napi::CallbackInfo& info) { Napi::Value MetaGroupWrapper::metaMakeDump(const Napi::CallbackInfo& info) { return wrapResult(info, [&] { - auto env = info.Env(); - oxenc::bt_dict_producer combined; // NOTE: the keys have to be in ascii-sorted order: @@ -192,7 +163,6 @@ void MetaGroupWrapper::metaConfirmPushed(const Napi::CallbackInfo& info) { auto groupInfo = obj.Get("groupInfo"); auto groupMember = obj.Get("groupMember"); - auto groupKeys = obj.Get("groupKeys"); if (!groupInfo.IsNull() && !groupInfo.IsUndefined()) { assertIsArray(groupInfo); @@ -429,7 +399,6 @@ Napi::Value MetaGroupWrapper::memberGetAllPendingRemovals(const Napi::CallbackIn Napi::Value MetaGroupWrapper::memberGet(const Napi::CallbackInfo& info) { return wrapResult(info, [&] { - auto env = info.Env(); assertInfoLength(info, 1); assertIsString(info[0]); @@ -440,7 +409,6 @@ Napi::Value MetaGroupWrapper::memberGet(const Napi::CallbackInfo& info) { Napi::Value MetaGroupWrapper::memberGetOrConstruct(const Napi::CallbackInfo& info) { return wrapResult(info, [&] { - auto env = info.Env(); assertInfoLength(info, 1); assertIsString(info[0]); @@ -475,7 +443,6 @@ Napi::Value MetaGroupWrapper::memberSetInvited(const Napi::CallbackInfo& info) { this->meta_group->members->set(m); return this->meta_group->members->get_or_construct(pubkeyHex); - }); } diff --git a/src/meta/meta_base_wrapper.hpp b/src/meta/meta_base_wrapper.hpp index 01082dc..1b572cc 100644 --- a/src/meta/meta_base_wrapper.hpp +++ b/src/meta/meta_base_wrapper.hpp @@ -68,6 +68,7 @@ class MetaBaseWrapper { std::optional dumped_keys; if (dumped_meta) { + auto dumped_meta_str = from_unsigned_sv(*dumped_meta); oxenc::bt_dict_consumer combined{dumped_meta_str}; @@ -101,7 +102,8 @@ class MetaBaseWrapper { *info, *members); - return std::make_unique(info, members, keys,group_ed25519_pubkey, group_ed25519_secretkey); + return std::make_unique( + info, members, keys, group_ed25519_pubkey, group_ed25519_secretkey); }); } }; diff --git a/src/utilities.hpp b/src/utilities.hpp index 8a99ef7..45ebbe3 100644 --- a/src/utilities.hpp +++ b/src/utilities.hpp @@ -8,7 +8,6 @@ #include #include #include -#include #include "session/config/namespaces.hpp" #include "session/types.hpp"