moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

This commit is contained in:
Henry Jameson 2022-08-10 02:59:08 +03:00
parent 2c0eb29b28
commit 894a506382
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/serverSideStorage.js
View File

@ -88,6 +88,8 @@ export const _getAllFlags = (recent, stale) => {
} }
export const _mergeFlags = (recent, stale, allFlagKeys) => { export const _mergeFlags = (recent, stale, allFlagKeys) => {
if (!stale.flagStorage) return recent.flagStorage
if (!recent.flagStorage) return stale.flagStorage
return Object.fromEntries(allFlagKeys.map(flag => { return Object.fromEntries(allFlagKeys.map(flag => {
const recentFlag = recent.flagStorage[flag] const recentFlag = recent.flagStorage[flag]
const staleFlag = stale.flagStorage[flag] const staleFlag = stale.flagStorage[flag]
@ -113,7 +115,10 @@ export const _mergePrefs = (recent, stale, allFlagKeys) => {
*/ */
const resultOutput = { ...recentData } const resultOutput = { ...recentData }
const totalJournal = uniqBy( const totalJournal = uniqBy(
[...recentJournal, ...staleJournal].sort((a, b) => a.timestamp > b.timestamp ? -1 : 1), [
...(Array.isArray(recentJournal) ? recentJournal : []),
...(Array.isArray(staleJournal) ? staleJournal : [])
].sort((a, b) => a.timestamp > b.timestamp ? -1 : 1),
'path' 'path'
).reverse() ).reverse()
totalJournal.forEach(({ path, timestamp, operation, args }) => { totalJournal.forEach(({ path, timestamp, operation, args }) => {
@ -243,6 +248,7 @@ export const mutations = {
state.cache._timestamp = Math.min(stale._timestamp, recent._timestamp) state.cache._timestamp = Math.min(stale._timestamp, recent._timestamp)
} }
state.flagStorage = state.cache.flagStorage state.flagStorage = state.cache.flagStorage
state.prefsStorage = state.cache.prefsStorage
}, },
setFlag (state, { flag, value }) { setFlag (state, { flag, value }) {
state.flagStorage[flag] = value state.flagStorage[flag] = value