From 8fe608aacb580cf58e102220e983ced9bfac4d77 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 15 Jan 2025 17:12:16 +1100 Subject: [PATCH 1/2] fix: attempt to metaMerge only if we have something to merge --- package.json | 2 +- src/groups/meta_group_wrapper.cpp | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b40ef52..8092757 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "main": "index.js", "name": "libsession_util_nodejs", "description": "Wrappers for the Session Util Library", - "version": "0.4.11", + "version": "0.4.12", "license": "GPL-3.0", "author": { "name": "Oxen Project", diff --git a/src/groups/meta_group_wrapper.cpp b/src/groups/meta_group_wrapper.cpp index 4c49679..f3ffdb6 100644 --- a/src/groups/meta_group_wrapper.cpp +++ b/src/groups/meta_group_wrapper.cpp @@ -337,8 +337,10 @@ Napi::Value MetaGroupWrapper::metaMerge(const Napi::CallbackInfo& info) { toCppBufferView(itemObject.Get("data"), "meta.merge")); } - auto info_merged = this->meta_group->info->merge(conf_strs); - count_merged += info_merged.size(); + if(conf_strs.size()){ + auto info_merged = this->meta_group->info->merge(conf_strs); + count_merged += info_merged.size(); + } } if (!groupMember.IsNull() && !groupMember.IsUndefined()) { @@ -362,9 +364,10 @@ Napi::Value MetaGroupWrapper::metaMerge(const Napi::CallbackInfo& info) { toCppBufferView(itemObject.Get("data"), "meta.merge")); } - auto member_merged = this->meta_group->members->merge(conf_strs); - - count_merged += member_merged.size(); + if(conf_strs.size()){ + auto member_merged = this->meta_group->members->merge(conf_strs); + count_merged += member_merged.size(); + } } if (this->meta_group->keys->needs_rekey()) { From 7e3a651cb134c087dd1d6c7b02cee23101e98820 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 15 Jan 2025 17:18:03 +1100 Subject: [PATCH 2/2] chore: fix CI to use macos-13 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 568333b..25ce3dc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, macos-12, ubuntu-20.04] + os: [windows-2022, macos-13, ubuntu-20.04] env: SIGNAL_ENV: production GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}