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

Compare commits

base: hj:739c4420f3b28adb7df0655d17d3ab5e5dc00679
Branches Tags
hj:shigusegubu-themes3
hj:shigusegubu
hj:develop
hj:shigusegubu-clean
hj:shigusegubu-vue3
..
compare: hj:94570af748a34364e8f1f2ade323e9ef2013cdaf
Branches Tags
hj:shigusegubu-themes3
hj:shigusegubu
hj:develop
hj:shigusegubu-clean
hj:shigusegubu-vue3

No commits in common. "739c4420f3b28adb7df0655d17d3ab5e5dc00679" and "94570af748a34364e8f1f2ade323e9ef2013cdaf" have entirely different histories.
739c4420f3 ... 94570af748

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}`),
})),
muteFiltersDraftObject: cloneDeep(
useSyncConfigStore().prefsStorage.simple.muteFilters,
useMergedConfigStore().mergedConfig.muteFilters,
),
muteFiltersDraftDirty: Object.fromEntries(
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 result = Object.fromEntries(
Object.keys(ROOT_CONFIG).map((k) => [
Object.keys(INSTANCE_DEFAULT_CONFIG).map((k) => [
k,
getValue(k) ?? getDefault(k),
]),
@ -41,7 +41,7 @@ export const useMergedConfigStore = defineStore('merged_config', {
const getDefault = (k) => instancePrefs[k] ?? ROOT_CONFIG[k]
const result = Object.fromEntries(
Object.keys(ROOT_CONFIG).map((k) => [
Object.keys(INSTANCE_DEFAULT_CONFIG).map((k) => [
k,
getDefault(k),
]),
@ -58,7 +58,7 @@ export const useMergedConfigStore = defineStore('merged_config', {
tempPrefs[k] ?? localPrefs[k] ?? syncPrefs.simple[k] ?? instancePrefs[k]
const result = Object.fromEntries(
Object.keys(ROOT_CONFIG).map(([k, value]) => [
Object.keys(INSTANCE_DEFAULT_CONFIG).map(([k, value]) => [
k,
getValue(k),
]),