pleroma-fe

commit: d9154224dbec38b0b111dfbf8fed373ae814cade
parent 567931bc884e18bc0fda2f87b13665fe55a24584
Author: Henry Jameson <me@hjkos.com>
Date:   Sun, 26 Jan 2025 22:26:17 +0200

fix missing default pinned actions

Diffstat:
M
src/modules/serverSideStorage.js
14
+++++---------

1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/modules/serverSideStorage.js b/src/modules/serverSideStorage.js
@@ -9,7 +9,8 @@ import {
   groupBy,
   findLastIndex,
   takeRight,
-  uniqWith
+  uniqWith,
+  merge as _merge
 } from 'lodash'
 import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/update_notification.js'
 
@@ -127,15 +128,10 @@ export const _getRecentData = (cache, live, isTest) => {
     _version: a._version ?? b._version,
     _timestamp: a._timestamp ?? b._timestamp,
     needUpload: b.needUpload ?? a.needUpload,
-    prefsStorage: {
-      ...a.prefsStorage,
-      ...b.prefsStorage
-    },
-    flagStorage: {
-      ...a.flagStorage,
-      ...b.flagStorage
-    }
+    prefsStorage: _merge(a.prefsStorage, b.prefsStorage),
+    flagStorage: _merge(a.flagStorage, b.flagStorage)
   })
+  console.log(result.recent)
   result.recent = isTest ? result.recent : (result.recent && merge(defaultState, result.recent))
   result.stale = isTest ? result.stale : (result.stale && merge(defaultState, result.stale))