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

Merge branch 'setttingssync' into shigusegubu-themes3

Browse source
This commit is contained in:
Henry Jameson 2026-03-24 21:48:38 +02:00
commit 739c4420f3
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/settings_modal/tabs/filtering_tab.js
View file

@ -37,7 +37,7 @@ const FilteringTab = {
label: this.$t(`user_card.mute_block_${mode}`), label: this.$t(`user_card.mute_block_${mode}`),
})), })),
muteFiltersDraftObject: cloneDeep( muteFiltersDraftObject: cloneDeep(
useMergedConfigStore().mergedConfig.muteFilters, useSyncConfigStore().prefsStorage.simple.muteFilters,
), ),
muteFiltersDraftDirty: Object.fromEntries( muteFiltersDraftDirty: Object.fromEntries(
Object.entries( Object.entries(

6
src/stores/merged_config.js
View file

@ -28,7 +28,7 @@ export const useMergedConfigStore = defineStore('merged_config', {
const getDefault = (k) => instancePrefs[k] ?? ROOT_CONFIG[k] const getDefault = (k) => instancePrefs[k] ?? ROOT_CONFIG[k]
const result = Object.fromEntries( const result = Object.fromEntries(
Object.keys(INSTANCE_DEFAULT_CONFIG).map((k) => [ Object.keys(ROOT_CONFIG).map((k) => [
k, k,
getValue(k) ?? getDefault(k), getValue(k) ?? getDefault(k),
]), ]),
@ -41,7 +41,7 @@ export const useMergedConfigStore = defineStore('merged_config', {
const getDefault = (k) => instancePrefs[k] ?? ROOT_CONFIG[k] const getDefault = (k) => instancePrefs[k] ?? ROOT_CONFIG[k]
const result = Object.fromEntries( const result = Object.fromEntries(
Object.keys(INSTANCE_DEFAULT_CONFIG).map((k) => [ Object.keys(ROOT_CONFIG).map((k) => [
k, k,
getDefault(k), getDefault(k),
]), ]),
@ -58,7 +58,7 @@ export const useMergedConfigStore = defineStore('merged_config', {
tempPrefs[k] ?? localPrefs[k] ?? syncPrefs.simple[k] ?? instancePrefs[k] tempPrefs[k] ?? localPrefs[k] ?? syncPrefs.simple[k] ?? instancePrefs[k]
const result = Object.fromEntries( const result = Object.fromEntries(
Object.keys(INSTANCE_DEFAULT_CONFIG).map(([k, value]) => [ Object.keys(ROOT_CONFIG).map(([k, value]) => [
k, k,
getValue(k), getValue(k),
]), ]),