hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix missing default pinned actions

Browse source
This commit is contained in:
Henry Jameson 2025-01-26 22:26:17 +02:00
parent 567931bc88
commit d9154224db
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/modules/serverSideStorage.js
View file

@ -9,7 +9,8 @@ import {
groupBy, groupBy,
findLastIndex, findLastIndex,
takeRight, takeRight,
uniqWith uniqWith,
merge as _merge
} from 'lodash' } from 'lodash'
import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/update_notification.js' 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, _version: a._version ?? b._version,
_timestamp: a._timestamp ?? b._timestamp, _timestamp: a._timestamp ?? b._timestamp,
needUpload: b.needUpload ?? a.needUpload, needUpload: b.needUpload ?? a.needUpload,
prefsStorage: { prefsStorage: _merge(a.prefsStorage, b.prefsStorage),
...a.prefsStorage, flagStorage: _merge(a.flagStorage, b.flagStorage)
...b.prefsStorage
},
flagStorage: {
...a.flagStorage,
...b.flagStorage
}
}) })
console.log(result.recent)
result.recent = isTest ? result.recent : (result.recent && merge(defaultState, result.recent)) result.recent = isTest ? result.recent : (result.recent && merge(defaultState, result.recent))
result.stale = isTest ? result.stale : (result.stale && merge(defaultState, result.stale)) result.stale = isTest ? result.stale : (result.stale && merge(defaultState, result.stale))