Skip to content

feat: allow to reset sending state to all members #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2025
Merged

feat: allow to reset sending state to all members #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"main": "index.js",
"name": "libsession_util_nodejs",
"description": "Wrappers for the Session Util Library",
"version": "0.4.15",
"version": "0.4.16",
"license": "GPL-3.0",
"author": {
"name": "Oxen Project",
Expand Down
21 changes: 19 additions & 2 deletions src/groups/meta_group_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ void MetaGroupWrapper::Init(Napi::Env env, Napi::Object exports) {
&MetaGroupWrapper::memberSetPromotionAccepted),
InstanceMethod(
"memberSetProfilePicture", &MetaGroupWrapper::memberSetProfilePicture),
InstanceMethod(
"memberResetAllSendingState",
&MetaGroupWrapper::memberResetAllSendingState),
InstanceMethod("memberEraseAndRekey", &MetaGroupWrapper::memberEraseAndRekey),

// keys exposed functions
Expand Down Expand Up @@ -340,7 +343,7 @@ Napi::Value MetaGroupWrapper::metaMerge(const Napi::CallbackInfo& info) {
toCppBufferView(itemObject.Get("data"), "meta.merge"));
}

if(conf_strs.size()){
if (conf_strs.size()) {
auto info_merged = this->meta_group->info->merge(conf_strs);
count_merged += info_merged.size();
}
Expand All @@ -367,7 +370,7 @@ Napi::Value MetaGroupWrapper::metaMerge(const Napi::CallbackInfo& info) {
toCppBufferView(itemObject.Get("data"), "meta.merge"));
}

if(conf_strs.size()){
if (conf_strs.size()) {
auto member_merged = this->meta_group->members->merge(conf_strs);
count_merged += member_merged.size();
}
Expand Down Expand Up @@ -669,6 +672,20 @@ void MetaGroupWrapper::memberSetProfilePicture(const Napi::CallbackInfo& info) {
});
}

Napi::Value MetaGroupWrapper::memberResetAllSendingState(const Napi::CallbackInfo& info) {
return wrapResult(info, [&] {
bool changed = false;
for (auto& member : *this->meta_group->members) {
auto sending = this->meta_group->members->has_pending_send(member.session_id);
if (sending) {
this->meta_group->members->set_pending_send(member.session_id, false);
changed = true;
}
}
return changed;
});
}

void MetaGroupWrapper::membersMarkPendingRemoval(const Napi::CallbackInfo& info) {
wrapExceptions(info, [&] {
assertInfoLength(info, 2);
Expand Down
1 change: 1 addition & 0 deletions src/groups/meta_group_wrapper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ class MetaGroupWrapper : public Napi::ObjectWrap<MetaGroupWrapper> {
void memberSetPromotionFailed(const Napi::CallbackInfo& info);
void memberSetPromotionAccepted(const Napi::CallbackInfo& info);
void memberSetProfilePicture(const Napi::CallbackInfo& info);
Napi::Value memberResetAllSendingState(const Napi::CallbackInfo& info);
void memberSetSupplement(const Napi::CallbackInfo& info);
Napi::Value memberEraseAndRekey(const Napi::CallbackInfo& info);
void membersMarkPendingRemoval(const Napi::CallbackInfo& info);
Expand Down
1 change: 1 addition & 0 deletions types/groups/groupmembers.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ declare module 'libsession_util_nodejs' {
memberSetPromotionAccepted: (pubkeyHex: PubkeyType) => void;

memberSetProfilePicture: (pubkeyHex: PubkeyType, profilePicture: ProfilePicture) => void;
memberResetAllSendingState: () => boolean;
memberSetSupplement: (pubkeyHex: PubkeyType) => void;
membersMarkPendingRemoval: (members: Array<PubkeyType>, withMessages: boolean) => void;

Expand Down
2 changes: 2 additions & 0 deletions types/groups/metagroup.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ declare module 'libsession_util_nodejs' {
public memberEraseAndRekey: MetaGroupWrapper['memberEraseAndRekey'];
public membersMarkPendingRemoval: MetaGroupWrapper['membersMarkPendingRemoval'];
public memberSetProfilePicture: MetaGroupWrapper['memberSetProfilePicture'];
public memberResetAllSendingState: MetaGroupWrapper['memberResetAllSendingState'];
public memberSetSupplement: MetaGroupWrapper['memberSetSupplement'];

// keys
Expand Down Expand Up @@ -154,6 +155,7 @@ declare module 'libsession_util_nodejs' {
| MakeActionCall<MetaGroupWrapper, 'memberEraseAndRekey'>
| MakeActionCall<MetaGroupWrapper, 'membersMarkPendingRemoval'>
| MakeActionCall<MetaGroupWrapper, 'memberSetProfilePicture'>
| MakeActionCall<MetaGroupWrapper, 'memberResetAllSendingState'>
| MakeActionCall<MetaGroupWrapper, 'memberSetSupplement'>

// keys actions
Expand Down