Page Menu
Home
Phorge
Search
Configure Global Search
Log In
Files
F85951450
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Authored By
Unknown
Size
24 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/src/components/settings_modal/helpers/choice_setting.js b/src/components/settings_modal/helpers/choice_setting.js
index 60e88ab8fc..0ffeeff813 100644
--- a/src/components/settings_modal/helpers/choice_setting.js
+++ b/src/components/settings_modal/helpers/choice_setting.js
@@ -55,7 +55,8 @@ export default {
return this.options
},
localizedPlaceholder() {
- return this.realOptions.find(({ key }) => key === this.realPlaceholder)?.label
- }
+ return this.realOptions.find(({ key }) => key === this.realPlaceholder)
+ ?.label
+ },
},
}
diff --git a/src/components/settings_modal/helpers/font_setting.js b/src/components/settings_modal/helpers/font_setting.js
index 04a4b4f050..90d14a528f 100644
--- a/src/components/settings_modal/helpers/font_setting.js
+++ b/src/components/settings_modal/helpers/font_setting.js
@@ -1,5 +1,5 @@
-import Setting from './setting.js'
import FontControl from 'src/components/font_control/font_control.vue'
+import Setting from './setting.js'
export default {
...Setting,
diff --git a/src/components/settings_modal/helpers/scope_setting.js b/src/components/settings_modal/helpers/scope_setting.js
index fa2aaf986f..86f3285035 100644
--- a/src/components/settings_modal/helpers/scope_setting.js
+++ b/src/components/settings_modal/helpers/scope_setting.js
@@ -1,5 +1,5 @@
-import Setting from './setting.js'
import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
+import Setting from './setting.js'
export default {
...Setting,
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index 4802b132af..0e0fb00417 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -2,8 +2,8 @@ import { cloneDeep, get, isEqual, set } from 'lodash-es'
import { useId } from 'vue'
import DraftButtons from './draft_buttons.vue'
-import SettingIndicators from './setting_indicators.vue'
import ModifiedIndicator from './modified_indicator.vue'
+import SettingIndicators from './setting_indicators.vue'
import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
import {
@@ -474,11 +474,10 @@ export default {
)
},
isDefined() {
- if (this.realSource !== 'fe-admin' && this.realSource !== 'local') return false
+ if (this.realSource !== 'fe-admin' && this.realSource !== 'local')
+ return false
if (this.isLocalOnly) return false
- return (
- this.visibleState !== undefined
- )
+ return this.visibleState !== undefined
},
classes() {
return {
diff --git a/src/components/settings_modal/helpers/setting_indicators.vue b/src/components/settings_modal/helpers/setting_indicators.vue
index a582642434..46b6766aa4 100644
--- a/src/components/settings_modal/helpers/setting_indicators.vue
+++ b/src/components/settings_modal/helpers/setting_indicators.vue
@@ -64,7 +64,11 @@
import Popover from 'src/components/popover/popover.vue'
import { library } from '@fortawesome/fontawesome-svg-core'
-import { faDesktop, faScrewdriverWrench, faWrench } from '@fortawesome/free-solid-svg-icons'
+import {
+ faDesktop,
+ faScrewdriverWrench,
+ faWrench,
+} from '@fortawesome/free-solid-svg-icons'
library.add(faDesktop, faScrewdriverWrench, faWrench)
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 2d8cc356d2..e36bf7ae28 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -16,11 +16,11 @@ import {
ROOT_CONFIG_DEFINITIONS,
validateSetting,
} from 'src/stores/default_state/default_config_state.js'
-import { useUsersStore } from 'src/stores/users.js'
import { useInterfaceStore } from 'src/stores/interface.js'
import { useLocalConfigStore } from 'src/stores/local_config.js'
import { useMergedConfigStore } from 'src/stores/merged_config.js'
import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUsersStore } from 'src/stores/users.js'
import {
newExporter,
@@ -266,7 +266,7 @@ const SettingsModal = {
modalMinimized: (store) => store.settingsModalState === 'minimized',
}),
...mapState(useUsersStore, {
- isAdmin: (store) => store.currentUser?.rights.admin
+ isAdmin: (store) => store.currentUser?.rights.admin,
}),
expertLevel: {
get() {
@@ -294,7 +294,7 @@ const SettingsModal = {
if (value === 'fe-admin' && this.isAdmin) {
useAdminSettingsStore().loadAdminStuff()
}
- }
+ },
},
}
diff --git a/src/components/settings_modal/tabs/appearance_tab.js b/src/components/settings_modal/tabs/appearance_tab.js
index 7bb31e84a1..0450ba0a15 100644
--- a/src/components/settings_modal/tabs/appearance_tab.js
+++ b/src/components/settings_modal/tabs/appearance_tab.js
@@ -1,5 +1,3 @@
-import { mapActions } from 'pinia'
-
import fileSizeFormatService from 'src/components/../services/file_size_format/file_size_format.js'
import PaletteEditor from 'src/components/palette_editor/palette_editor.vue'
import BooleanSetting from '../helpers/boolean_setting.vue'
@@ -10,14 +8,13 @@ import SharedComputedObject from '../helpers/shared_computed_object.js'
import UnitSetting from '../helpers/unit_setting.vue'
import Preview from './old_theme_tab/theme_preview.vue'
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
import { useInstanceStore } from 'src/stores/instance.js'
import { normalizeThemeData, useInterfaceStore } from 'src/stores/interface.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
-import { useUsersStore } from 'src/stores/users.js'
-import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
import { useLocalConfigStore } from 'src/stores/local_config.js'
+import { useOAuthStore } from 'src/stores/oauth.js'
import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
import { updateProfileImages } from 'src/api/user.js'
import { newImporter } from 'src/services/export_import/export_import.js'
@@ -278,13 +275,14 @@ const AppearanceTab = {
return () => Promise.resolve(this.configSource.styleCustomData)
},
autoPalettes() {
- const palettesSet = this.stylePalettes.length > 0
- ? this.stylePalettes
- : this.bundledPalettes
+ const palettesSet =
+ this.stylePalettes.length > 0
+ ? this.stylePalettes
+ : this.bundledPalettes
return [
- palettesSet.find(x => /dark/i.test(x.name)) ?? palettesSet[0],
- palettesSet.find(x => /light/i.test(x.name)) ?? palettesSet[0],
+ palettesSet.find((x) => /dark/i.test(x.name)) ?? palettesSet[0],
+ palettesSet.find((x) => /light/i.test(x.name)) ?? palettesSet[0],
]
},
autoIsDarkLight() {
@@ -317,10 +315,16 @@ const AppearanceTab = {
isStyleDefined() {
if (this.defaultSource === 'local') {
const store = useLocalConfigStore().mergedConfig
- return Object.hasOwn(store, 'style') || Object.hasOwn(store, 'styleCustomData')
+ return (
+ Object.hasOwn(store, 'style') ||
+ Object.hasOwn(store, 'styleCustomData')
+ )
} else if (this.defaultSource === 'fe-admin') {
const store = useAdminSettingsStore().frontendConfig ?? {}
- return Object.hasOwn(store, 'style') || Object.hasOwn(store, 'styleCustomData')
+ return (
+ Object.hasOwn(store, 'style') ||
+ Object.hasOwn(store, 'styleCustomData')
+ )
} else {
return true
}
@@ -328,10 +332,16 @@ const AppearanceTab = {
isPaletteDefined() {
if (this.defaultSource === 'local') {
const store = useLocalConfigStore().mergedConfig
- return Object.hasOwn(store, 'palette') || Object.hasOwn(store, 'paletteCustomData')
+ return (
+ Object.hasOwn(store, 'palette') ||
+ Object.hasOwn(store, 'paletteCustomData')
+ )
} else if (this.defaultSource === 'fe-admin') {
const store = useAdminSettingsStore().frontendConfig ?? {}
- return Object.hasOwn(store, 'palette') || Object.hasOwn(store, 'paletteCustomData')
+ return (
+ Object.hasOwn(store, 'palette') ||
+ Object.hasOwn(store, 'paletteCustomData')
+ )
} else {
return true
}
@@ -409,7 +419,10 @@ const AppearanceTab = {
},
onImport(parsed, filename) {
if (filename.endsWith('.json')) {
- useInterfaceStore().setThemeCustom(parsed.source || parsed.theme, this.defaultSource)
+ useInterfaceStore().setThemeCustom(
+ parsed.source || parsed.theme,
+ this.defaultSource,
+ )
} else if (filename.endsWith('.iss')) {
useInterfaceStore().setStyleCustom(parsed, this.defaultSource)
}
@@ -440,8 +453,10 @@ const AppearanceTab = {
},
isPaletteActive(key) {
if (key === 'auto') {
- return this.configSource.palette === undefined
- || this.configSource.palette === key
+ return (
+ this.configSource.palette === undefined ||
+ this.configSource.palette === key
+ )
}
return this.configSource.palette === key
},
diff --git a/src/components/settings_modal/tabs/composing_tab.js b/src/components/settings_modal/tabs/composing_tab.js
index 5bd6ec2383..b88b1829bf 100644
--- a/src/components/settings_modal/tabs/composing_tab.js
+++ b/src/components/settings_modal/tabs/composing_tab.js
@@ -4,10 +4,10 @@ import FontControl from 'src/components/font_control/font_control.vue'
import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
import Select from 'src/components/select/select.vue'
import BooleanSetting from '../helpers/boolean_setting.vue'
-import ScopeSetting from '../helpers/scope_setting.vue'
import ChoiceSetting from '../helpers/choice_setting.vue'
import FloatSetting from '../helpers/float_setting.vue'
import IntegerSetting from '../helpers/integer_setting.vue'
+import ScopeSetting from '../helpers/scope_setting.vue'
import SharedComputedObject from '../helpers/shared_computed_object.js'
import UnitSetting from '../helpers/unit_setting.vue'
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index afbd74110e..ad5730b4bb 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -2,9 +2,9 @@ import { mapState } from 'pinia'
import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
import BooleanSetting from '../helpers/boolean_setting.vue'
-import FontSetting from '../helpers/font_setting.vue'
import ChoiceSetting from '../helpers/choice_setting.vue'
import FloatSetting from '../helpers/float_setting.vue'
+import FontSetting from '../helpers/font_setting.vue'
import SharedComputedObject from '../helpers/shared_computed_object.js'
import UnitSetting from '../helpers/unit_setting.vue'
diff --git a/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js b/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js
index 8de77ff7a0..289bd6dc07 100644
--- a/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js
+++ b/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js
@@ -1,4 +1,5 @@
-import { useId, computed } from 'vue'
+import { computed, useId } from 'vue'
+
import Checkbox from 'src/components/checkbox/checkbox.vue'
import ColorInput from 'src/components/color_input/color_input.vue'
import ContrastRatio from 'src/components/contrast_ratio/contrast_ratio.vue'
diff --git a/src/components/settings_modal/tabs/posts_tab.js b/src/components/settings_modal/tabs/posts_tab.js
index e57ded3bfe..dfdfd5235a 100644
--- a/src/components/settings_modal/tabs/posts_tab.js
+++ b/src/components/settings_modal/tabs/posts_tab.js
@@ -1,6 +1,6 @@
-import FontSetting from '../helpers/font_setting.vue'
import BooleanSetting from '../helpers/boolean_setting.vue'
import ChoiceSetting from '../helpers/choice_setting.vue'
+import FontSetting from '../helpers/font_setting.vue'
import IntegerSetting from '../helpers/integer_setting.vue'
import SharedComputedObject from '../helpers/shared_computed_object.js'
import UnitSetting from '../helpers/unit_setting.vue'
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 933e06aaef..fd20cfd99a 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -179,12 +179,7 @@ export const tryLoadCache = async () => {
}
}
-export const applyTheme = (
- input,
- onEagerFinish,
- onFinish,
- debug = false,
-) => {
+export const applyTheme = (input, onEagerFinish, onFinish, debug = false) => {
const eagerStyles = createStyleSheet(EAGER_STYLE_ID, 10)
const lazyStyles = createStyleSheet(LAZY_STYLE_ID, 20)
diff --git a/src/stores/instance.js b/src/stores/instance.js
index c7d3b1f928..e4eb011385 100644
--- a/src/stores/instance.js
+++ b/src/stores/instance.js
@@ -3,11 +3,9 @@ import { defineStore } from 'pinia'
import {
convertDefinitions,
- INSTANCE_DEFAULT_CONFIG,
INSTANCE_DEFAULT_CONFIG_DEFINITIONS,
INSTANCE_IDENTITY_DEFAULT,
INSTANCE_IDENTITY_DEFAULT_DEFINITIONS,
- LOCAL_DEFAULT_CONFIG,
LOCAL_DEFAULT_CONFIG_DEFINITIONS,
validateSetting,
} from 'src/stores/default_state/default_config_state.js'
@@ -190,8 +188,8 @@ export const useInstanceStore = defineStore('instance', {
}[subpath]
} else if (path.startsWith('limits.')) {
return path === 'limits.pollLimits' || path === 'limits.fieldsLimits'
- ? { required: true, type: 'object' }
- : { required: true, type: 'number' }
+ ? { required: true, type: 'object' }
+ : { required: true, type: 'number' }
} else {
const definitions = ROOT_STATE_DEFINITIONS
return definitions[subpath]
diff --git a/src/stores/interface.js b/src/stores/interface.js
index 206fdf6b3b..2b78010d1b 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -1,6 +1,6 @@
+import sum from 'hash-sum'
import { cloneDeep, set, unset } from 'lodash-es'
import { defineStore } from 'pinia'
-import sum from 'hash-sum'
import {
applyTheme,
@@ -13,13 +13,13 @@ import {
windowWidth,
} from '../services/window_utils/window_utils'
+import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
import { useInstanceStore } from 'src/stores/instance.js'
+import { useLocalConfigStore } from 'src/stores/local_config.js'
import { useMergedConfigStore } from 'src/stores/merged_config.js'
import { useOAuthStore } from 'src/stores/oauth.js'
import { useStreamingStore } from 'src/stores/streaming.js'
import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useLocalConfigStore } from 'src/stores/local_config.js'
-import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
import { useUsersStore } from 'src/stores/users.js'
import { WSConnectionStatus } from 'src/api/websocket.js'
@@ -367,30 +367,40 @@ export const useInterfaceStore = defineStore('interface', {
},
// Themes stuff
async setPreference({ path, value, store }) {
- switch(store) {
+ switch (store) {
case 'sync':
- return useSyncConfigStore().setPreference({ path: `simple.${path}`, value })
+ return useSyncConfigStore().setPreference({
+ path: `simple.${path}`,
+ value,
+ })
case 'local':
return useLocalConfigStore().set({ path, value })
// Copypasta from setting.js
case 'fe-admin': {
if (this.adminFrontendConfig === null) {
- this.adminFrontendConfig = cloneDeep(useAdminSettingsStore().frontendConfig)
+ this.adminFrontendConfig = cloneDeep(
+ useAdminSettingsStore().frontendConfig,
+ )
}
set(this.adminFrontendConfig, path, value)
}
}
},
async unsetPreference({ path, value, store }) {
- switch(store) {
+ switch (store) {
case 'sync':
- return useSyncConfigStore().setPreference({ path: `simple.${path}`, value: undefined })
+ return useSyncConfigStore().setPreference({
+ path: `simple.${path}`,
+ value: undefined,
+ })
case 'local':
return useLocalConfigStore().unset({ path, value })
// Copypasta from setting.js
case 'fe-admin': {
if (this.adminFrontendConfig === null) {
- this.adminFrontendConfig = cloneDeep(useAdminSettingsStore().frontendConfig)
+ this.adminFrontendConfig = cloneDeep(
+ useAdminSettingsStore().frontendConfig,
+ )
}
unset(this.adminFrontendConfig, path)
}
@@ -400,19 +410,26 @@ export const useInterfaceStore = defineStore('interface', {
if (store === 'sync') {
return useSyncConfigStore().pushSyncConfig()
} else if (store === 'fe-admin') {
- const path = [
- ':pleroma',
- ':frontend_configurations',
- ':pleroma_fe',
- ].join('.')
- const value = Object.fromEntries(
- Object.entries(this.adminFrontendConfig).map(([k, v]) => [`:${k}`, v]),
- )
- return useAdminSettingsStore().pushAdminSetting({
+ const path = [
+ ':pleroma',
+ ':frontend_configurations',
+ ':pleroma_fe',
+ ].join('.')
+ const value = Object.fromEntries(
+ Object.entries(this.adminFrontendConfig).map(([k, v]) => [
+ `:${k}`,
+ v,
+ ]),
+ )
+ return useAdminSettingsStore()
+ .pushAdminSetting({
path,
value,
- }).then(() => {
- this.adminFrontendConfig = cloneDeep(useAdminSettingsStore().frontendConfig)
+ })
+ .then(() => {
+ this.adminFrontendConfig = cloneDeep(
+ useAdminSettingsStore().frontendConfig,
+ )
})
} else {
return
@@ -628,16 +645,24 @@ export const useInterfaceStore = defineStore('interface', {
`Instance V2 name: ${instanceThemeV2Name}, custom: ${!!instanceThemeV2Snapshot}`,
)
- const userThemeV2Used = Boolean(userThemeV2Name || userThemeV2Source || userThemeV2Snapshot)
+ const userThemeV2Used = Boolean(
+ userThemeV2Name || userThemeV2Source || userThemeV2Snapshot,
+ )
const userThemeV3Used = Boolean(userStyleName || userStyleCustomData)
const userThemeUsed = userThemeV2Used || userThemeV3Used
- const instanceThemeV2Used = Boolean(instanceThemeV2Name || instanceThemeV2Source || instanceThemeV2Snapshot)
- const instanceThemeV3Used = Boolean(instanceStyleName || instanceStyleCustomData)
- const instanceThemeUsed = instanceThemeV2Used || instanceThemeV3Used
+ const instanceThemeV2Used = Boolean(
+ instanceThemeV2Name || instanceThemeV2Source || instanceThemeV2Snapshot,
+ )
+ // const instanceThemeV3Used = Boolean(
+ // instanceStyleName || instanceStyleCustomData,
+ // )
+ // const instanceThemeUsed = instanceThemeV2Used || instanceThemeV3Used
const userPaletteUsed = Boolean(userPaletteName || userPaletteCustomData)
- const instancePaletteUsed = Boolean(instancePaletteName || instancePaletteCustomData)
+ // const instancePaletteUsed = Boolean(
+ // instancePaletteName || instancePaletteCustomData,
+ // )
if (userStyleName === 'stock') userStyleName = undefined
if (instanceStyleName === 'stock') instanceStyleName = undefined
@@ -654,9 +679,13 @@ export const useInterfaceStore = defineStore('interface', {
const themeCustomData = (() => {
if (userThemeUsed) {
- return userThemeV2Used ? userThemeV2Source ?? userThemeV2Snapshot : userStyleCustomData
+ return userThemeV2Used
+ ? (userThemeV2Source ?? userThemeV2Snapshot)
+ : userStyleCustomData
} else {
- return instanceThemeV2Used ? instanceThemeV2Source ?? instanceThemeV2Snapshot : instanceStyleCustomData
+ return instanceThemeV2Used
+ ? (instanceThemeV2Source ?? instanceThemeV2Snapshot)
+ : instanceStyleCustomData
}
})()
const paletteCustomData = userPaletteUsed
@@ -750,10 +779,7 @@ export const useInterfaceStore = defineStore('interface', {
} = this.getUsedThemeInfo()
if (majorVersionUsed === 'v3') {
- await Promise.all([
- this.fetchPalettesIndex(),
- this.fetchStylesIndex(),
- ])
+ await Promise.all([this.fetchPalettesIndex(), this.fetchStylesIndex()])
} else {
// Promise.all just to be uniform with v3
await Promise.all([this.fetchThemesIndex()])
@@ -786,14 +812,15 @@ export const useInterfaceStore = defineStore('interface', {
return [
x.variant.replace(/\./g, '_'),
- () => ({ name: x.variant, ...cleanDirectives })
+ () => ({ name: x.variant, ...cleanDirectives }),
]
- })
+ }),
)
- const allPalettes = Object.keys(stylePalettes).length > 0
- ? stylePalettes
- : useInstanceStore().palettesIndex
+ const allPalettes =
+ Object.keys(stylePalettes).length > 0
+ ? stylePalettes
+ : useInstanceStore().palettesIndex
const defaultPalette = (() => {
if (this.prefersDark === null) return null
@@ -853,8 +880,8 @@ export const useInterfaceStore = defineStore('interface', {
const theme = await getData(
'theme',
useInstanceStore().themesIndex,
- userThemeV2Source || userThemeV2Snapshot,
- userThemeV2Name || instanceThemeV2Name,
+ themeCustomData,
+ themeName,
)
this.themeNameUsed = theme.nameUsed
this.themeDataUsed = theme.dataUsed
@@ -964,7 +991,11 @@ export const useInterfaceStore = defineStore('interface', {
(cache) => {
this.themeChangeInProgress = false
if (store) {
- this.setPreference({ path: 'themeChecksum', value: cache.checksum, store })
+ this.setPreference({
+ path: 'themeChecksum',
+ value: cache.checksum,
+ store,
+ })
this.pushPreferences({ store })
}
},
diff --git a/src/stores/local_config.js b/src/stores/local_config.js
index 165a144735..2e29c8bdad 100644
--- a/src/stores/local_config.js
+++ b/src/stores/local_config.js
@@ -6,7 +6,6 @@ import {
INSTANCE_DEFAULT_CONFIG_DEFINITIONS,
LOCAL_DEFAULT_CONFIG,
LOCAL_DEFAULT_CONFIG_DEFINITIONS,
- makeUndefined,
validateSetting,
} from 'src/stores/default_state/default_config_state.js'
@@ -66,8 +65,8 @@ export const useLocalConfigStore = defineStore('local_config', {
key,
Object.hasOwn(this.tempStorage, key)
? this.tempStorage[key]
- : this.prefsStorage[key]
- ])
+ : this.prefsStorage[key],
+ ]),
)
},
},
diff --git a/src/stores/merged_config.js b/src/stores/merged_config.js
index 897c4c6a17..bec81cfb2f 100644
--- a/src/stores/merged_config.js
+++ b/src/stores/merged_config.js
@@ -1,9 +1,6 @@
import { defineStore } from 'pinia'
-import {
- LOCAL_ONLY_KEYS,
- ROOT_CONFIG,
-} from 'src/stores/default_state/default_config_state.js'
+import { ROOT_CONFIG } from 'src/stores/default_state/default_config_state.js'
import { useInstanceStore } from 'src/stores/instance.js'
import { useLocalConfigStore } from 'src/stores/local_config.js'
import { useSyncConfigStore } from 'src/stores/sync_config.js'
@@ -40,10 +37,8 @@ export const useMergedConfigStore = defineStore('merged_config', {
const override = overrides[key]
const defaultValue = defaults[key]
- return override !== undefined
- ? [key, override]
- : [key, defaultValue]
- })
+ return override !== undefined ? [key, override] : [key, defaultValue]
+ }),
)
},
mergedConfigDefault: () => {
@@ -52,9 +47,7 @@ export const useMergedConfigStore = defineStore('merged_config', {
const getDefault = (k) => {
const value = instancePrefs[k]
- return value !== undefined
- ? value
- : ROOT_CONFIG[k]
+ return value !== undefined ? value : ROOT_CONFIG[k]
}
return Object.fromEntries(
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Thu, Nov 19, 12:48 PM (1 d, 23 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1841259
Default Alt Text
(24 KB)
Attached To
Mode
rPUFE pleroma-fe-upstream
Attached
Detach File
Event Timeline