Merge pull request #8 from Bilb/fix-attempt-merge-only-if-msgs

fix: attempt to metaMerge only if we have something to merge
session-foundation · Jan 15, 2025 · ffa6203 · ffa6203
2 parents 526e771 + 7e3a651
commit ffa6203
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git 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 }}

diff --git 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
@@ -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()) {