diff --git a/src/boot/after_store.js b/src/boot/after_store.js index b7e97cf45..97f9b8a42 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -17,7 +17,7 @@ config.autoAddCss = false import App from '../App.vue' import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js' import FaviconService from '../services/favicon_service/favicon_service.js' -import { applyConfig } from '../services/style_setter/style_setter.js' +import { applyStyleConfig } from '../services/style_setter/style_setter.js' import { initServiceWorker, updateFocus } from '../services/sw/sw.js' import { windowHeight, @@ -88,25 +88,25 @@ const getInstanceConfig = async ({ store }) => { data.pleroma, ) useInstanceStore().set({ - name: 'textlimit', + path: 'textlimit', value: textlimit, }) useInstanceStore().set({ - name: 'accountApprovalRequired', + path: 'accountApprovalRequired', value: data.approval_required, }) useInstanceStore().set({ - name: 'birthdayRequired', + path: 'birthdayRequired', value: !!data.pleroma?.metadata.birthday_required, }) useInstanceStore().set({ - name: 'birthdayMinAge', + path: 'birthdayMinAge', value: data.pleroma?.metadata.birthday_min_age || 0, }) if (vapidPublicKey) { useInstanceStore().set({ - name: 'vapidPublicKey', + path: 'vapidPublicKey', value: vapidPublicKey, }) } @@ -258,7 +258,7 @@ const getAppSecret = async ({ store }) => { const resolveStaffAccounts = ({ store, accounts }) => { const nicknames = accounts.map((uri) => uri.split('/').pop()) useInstanceStore().set({ - name: 'staffAccounts', + path: 'staffAccounts', value: nicknames, }) } @@ -384,20 +384,20 @@ const getNodeInfo = async ({ store }) => { const software = data.software useInstanceStore().set({ - name: 'backendVersion', + path: 'backendVersion', value: software.version, }) useInstanceStore().set({ - name: 'backendRepository', + path: 'backendRepository', value: software.repository, }) const priv = metadata.private - useInstanceStore().set({ name: 'privateMode', value: priv }) + useInstanceStore().set({ path: 'privateMode', value: priv }) const frontendVersion = window.___pleromafe_commit_hash useInstanceStore().set({ - name: 'frontendVersion', + path: 'frontendVersion', value: frontendVersion, }) @@ -547,7 +547,7 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => { return Promise.reject(e) } - applyConfig(store.state.config, i18n.global) + applyStyleConfig(store.state.config, i18n.global) // Now we can try getting the server settings and logging in // Most of these are preloaded into the index.html so blocking is minimized diff --git a/src/components/mfa_form/recovery_form.js b/src/components/mfa_form/recovery_form.js index 785ecc0a3..f4ddcadd0 100644 --- a/src/components/mfa_form/recovery_form.js +++ b/src/components/mfa_form/recovery_form.js @@ -2,8 +2,6 @@ import { mapActions, mapState, mapStores } from 'pinia' import mfaApi from '../../services/new_api/mfa.js' -import mfaApi from '../../services/new_api/mfa.js' - import { useAuthFlowStore } from 'src/stores/auth_flow.js' import { useInstanceStore } from 'src/stores/instance.js' import { useOAuthStore } from 'src/stores/oauth.js' diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js index c5b1d66f6..4c7914f32 100644 --- a/src/components/mobile_nav/mobile_nav.js +++ b/src/components/mobile_nav/mobile_nav.js @@ -13,7 +13,7 @@ import SideDrawer from '../side_drawer/side_drawer.vue' import { useAnnouncementsStore } from 'src/stores/announcements.js' import { useInstanceStore } from 'src/stores/instance.js' -import { useServerSideStorageStore } from 'src/stores/serverSideStorage.js' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import { library } from '@fortawesome/fontawesome-svg-core' import { @@ -75,7 +75,7 @@ const MobileNav = { return this.$route.name === 'chat' }, ...mapState(useAnnouncementsStore, ['unreadAnnouncementCount']), - ...mapState(useServerSideStorageStore, { + ...mapState(useSyncConfigStore, { pinnedItems: (store) => new Set(store.prefsStorage.collections.pinnedNavItems).has('chats'), }), diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js index 8aff31f02..9e5901f24 100644 --- a/src/components/nav_panel/nav_panel.js +++ b/src/components/nav_panel/nav_panel.js @@ -12,7 +12,7 @@ import NavigationPins from 'src/components/navigation/navigation_pins.vue' import { useAnnouncementsStore } from 'src/stores/announcements' import { useInstanceStore } from 'src/stores/instance.js' import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' -import { useServerSideStorageStore } from 'src/stores/serverSideStorage' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import { library } from '@fortawesome/fontawesome-svg-core' import { @@ -84,28 +84,28 @@ const NavPanel = { this.editMode = !this.editMode }, toggleCollapse() { - useServerSideStorageStore().setPreference({ + useSyncConfigStore().setPreference({ path: 'simple.collapseNav', value: !this.collapsed, }) - useServerSideStorageStore().pushServerSideStorage() + useSyncConfigStore().pushSyncConfig() }, isPinned(item) { return this.pinnedItems.has(item) }, togglePin(item) { if (this.isPinned(item)) { - useServerSideStorageStore().removeCollectionPreference({ + useSyncConfigStore().removeCollectionPreference({ path: 'collections.pinnedNavItems', value: item, }) } else { - useServerSideStorageStore().addCollectionPreference({ + useSyncConfigStore().addCollectionPreference({ path: 'collections.pinnedNavItems', value: item, }) } - useServerSideStorageStore().pushServerSideStorage() + useSyncConfigStore().pushSyncConfig() }, }, computed: { @@ -122,7 +122,7 @@ const NavPanel = { ...mapPiniaState(useInstanceStore, { privateMode: (store) => store.private, }), - ...mapPiniaState(useServerSideStorageStore, { + ...mapPiniaState(useSyncConfigStore, { collapsed: (store) => store.prefsStorage.simple.collapseNav, pinnedItems: (store) => new Set(store.prefsStorage.collections.pinnedNavItems), diff --git a/src/components/navigation/navigation_entry.js b/src/components/navigation/navigation_entry.js index 3384534be..7a43000ce 100644 --- a/src/components/navigation/navigation_entry.js +++ b/src/components/navigation/navigation_entry.js @@ -5,7 +5,7 @@ import { routeTo } from 'src/components/navigation/navigation.js' import OptionalRouterLink from 'src/components/optional_router_link/optional_router_link.vue' import { useAnnouncementsStore } from 'src/stores/announcements.js' -import { useServerSideStorageStore } from 'src/stores/serverSideStorage.js' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import { library } from '@fortawesome/fontawesome-svg-core' import { faThumbtack } from '@fortawesome/free-solid-svg-icons' @@ -23,17 +23,17 @@ const NavigationEntry = { }, togglePin(value) { if (this.isPinned(value)) { - useServerSideStorageStore().removeCollectionPreference({ + useSyncConfigStore().removeCollectionPreference({ path: 'collections.pinnedNavItems', value, }) } else { - useServerSideStorageStore().addCollectionPreference({ + useSyncConfigStore().addCollectionPreference({ path: 'collections.pinnedNavItems', value, }) } - useServerSideStorageStore().pushServerSideStorage() + useSyncConfigStore().pushSyncConfig() }, }, computed: { @@ -47,7 +47,7 @@ const NavigationEntry = { ...mapState({ currentUser: (state) => state.users.currentUser, }), - ...mapPiniaState(useServerSideStorageStore, { + ...mapPiniaState(useSyncConfigStore, { pinnedItems: (store) => new Set(store.prefsStorage.collections.pinnedNavItems), }), diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js index 698bf5d59..85f6fafee 100644 --- a/src/components/navigation/navigation_pins.js +++ b/src/components/navigation/navigation_pins.js @@ -18,7 +18,7 @@ import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders' import { useInstanceStore } from 'src/stores/instance.js' import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' import { useListsStore } from 'src/stores/lists' -import { useServerSideStorageStore } from 'src/stores/serverSideStorage' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import { library } from '@fortawesome/fontawesome-svg-core' import { @@ -70,7 +70,7 @@ const NavPanel = { ...mapPiniaState(useBookmarkFoldersStore, { bookmarks: getBookmarkFolderEntries, }), - ...mapPiniaState(useServerSideStorageStore, { + ...mapPiniaState(useSyncConfigStore, { pinnedItems: (store) => new Set(store.prefsStorage.collections.pinnedNavItems), }), diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js index a986ef36c..654eacaa0 100644 --- a/src/components/settings_modal/helpers/setting.js +++ b/src/components/settings_modal/helpers/setting.js @@ -345,7 +345,8 @@ export default { }, matchesExpertLevel() { const settingExpertLevel = this.expert || 0 - const userToggleExpert = this.$store.state.config.expertLevel || 0 + const userToggleExpert = + useSyncConfigStore().mergedConfig.expertLevel || 0 return settingExpertLevel <= userToggleExpert }, diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js index f2c071045..866459314 100644 --- a/src/components/settings_modal/settings_modal.js +++ b/src/components/settings_modal/settings_modal.js @@ -9,6 +9,7 @@ import PanelLoading from 'src/components/panel_loading/panel_loading.vue' import Popover from '../popover/popover.vue' import { useInterfaceStore } from 'src/stores/interface.js' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import { newExporter, @@ -191,11 +192,11 @@ const SettingsModal = { }), expertLevel: { get() { - return this.$store.state.config.expertLevel > 0 + return useSyncConfigStore().mergedConfig.expertLevel > 0 }, set(value) { - this.$store.dispatch('setOption', { - name: 'expertLevel', + useSyncConfigStore().setPreference({ + path: 'simple.expertLevel', value: value ? 1 : 0, }) }, diff --git a/src/components/settings_modal/tabs/clutter_tab.js b/src/components/settings_modal/tabs/clutter_tab.js index 23e069d21..f81ad7040 100644 --- a/src/components/settings_modal/tabs/clutter_tab.js +++ b/src/components/settings_modal/tabs/clutter_tab.js @@ -12,7 +12,7 @@ import UnitSetting from '../helpers/unit_setting.vue' import { useInstanceStore } from 'src/stores/instance.js' import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' -import { useServerSideStorageStore } from 'src/stores/serverSideStorage' +import { useSyncConfigStore } from 'src/stores/sync_config.js' const ClutterTab = { components: { @@ -33,7 +33,7 @@ const ClutterTab = { store.instanceIdentity.showInstanceSpecificPanel && store.instanceIdentity.instanceSpecificPanelContent, }), - ...mapState(useServerSideStorageStore, { + ...mapState(useSyncConfigStore, { muteFilters: (store) => Object.entries(store.prefsStorage.simple.muteFilters), muteFiltersObject: (store) => store.prefsStorage.simple.muteFilters, @@ -89,10 +89,10 @@ const ClutterTab = { }, }, methods: { - ...mapActions(useServerSideStorageStore, [ + ...mapActions(useSyncConfigStore, [ 'setPreference', 'unsetPreference', - 'pushServerSideStorage', + 'pushSyncConfig', ]), getDatetimeLocal(timestamp) { const date = new Date(timestamp) @@ -139,7 +139,7 @@ const ClutterTab = { filter.order = this.muteFilters.length + 2 this.muteFiltersDraftObject[newId] = filter this.setPreference({ path: 'simple.muteFilters.' + newId, value: filter }) - this.pushServerSideStorage() + this.pushSyncConfig() }, exportFilter(id) { this.exportedFilter = { ...this.muteFiltersDraftObject[id] } @@ -155,19 +155,19 @@ const ClutterTab = { this.muteFiltersDraftObject[newId] = filter this.setPreference({ path: 'simple.muteFilters.' + newId, value: filter }) - this.pushServerSideStorage() + this.pushSyncConfig() }, deleteFilter(id) { delete this.muteFiltersDraftObject[id] this.unsetPreference({ path: 'simple.muteFilters.' + id, value: null }) - this.pushServerSideStorage() + this.pushSyncConfig() }, purgeExpiredFilters() { this.muteFiltersExpired.forEach(([id]) => { delete this.muteFiltersDraftObject[id] this.unsetPreference({ path: 'simple.muteFilters.' + id, value: null }) }) - this.pushServerSideStorage() + this.pushSyncConfig() }, updateFilter(id, field, value) { const filter = { ...this.muteFiltersDraftObject[id] } @@ -193,7 +193,7 @@ const ClutterTab = { path: 'simple.muteFilters.' + id, value: this.muteFiltersDraftObject[id], }) - this.pushServerSideStorage() + this.pushSyncConfig() this.muteFiltersDraftDirty[id] = false }, }, diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js index 68efbe762..a0544dd30 100644 --- a/src/components/settings_modal/tabs/filtering_tab.js +++ b/src/components/settings_modal/tabs/filtering_tab.js @@ -13,7 +13,7 @@ import UnitSetting from '../helpers/unit_setting.vue' import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' import { useInterfaceStore } from 'src/stores/interface' -import { useServerSideStorageStore } from 'src/stores/serverSideStorage' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import { newExporter, @@ -36,11 +36,11 @@ const FilteringTab = { label: this.$t(`user_card.mute_block_${mode}`), })), muteFiltersDraftObject: cloneDeep( - useServerSideStorageStore().prefsStorage.simple.muteFilters, + useSyncConfigStore().prefsStorage.simple.muteFilters, ), muteFiltersDraftDirty: Object.fromEntries( Object.entries( - useServerSideStorageStore().prefsStorage.simple.muteFilters, + useSyncConfigStore().prefsStorage.simple.muteFilters, ).map(([k]) => [k, false]), ), exportedFilter: null, @@ -92,7 +92,7 @@ const FilteringTab = { }, computed: { ...SharedComputedObject(), - ...mapState(useServerSideStorageStore, { + ...mapState(useSyncConfigStore, { muteFilters: (store) => Object.entries(store.prefsStorage.simple.muteFilters), muteFiltersObject: (store) => store.prefsStorage.simple.muteFilters, @@ -149,10 +149,10 @@ const FilteringTab = { }, }, methods: { - ...mapActions(useServerSideStorageStore, [ + ...mapActions(useSyncConfigStore, [ 'setPreference', 'unsetPreference', - 'pushServerSideStorage', + 'pushSyncConfig', ]), getDatetimeLocal(timestamp) { const date = new Date(timestamp) @@ -199,7 +199,7 @@ const FilteringTab = { filter.order = this.muteFilters.length + 2 this.muteFiltersDraftObject[newId] = filter this.setPreference({ path: 'simple.muteFilters.' + newId, value: filter }) - this.pushServerSideStorage() + this.pushSyncConfig() }, exportFilter(id) { this.exportedFilter = { ...this.muteFiltersDraftObject[id] } @@ -215,19 +215,19 @@ const FilteringTab = { this.muteFiltersDraftObject[newId] = filter this.setPreference({ path: 'simple.muteFilters.' + newId, value: filter }) - this.pushServerSideStorage() + this.pushSyncConfig() }, deleteFilter(id) { delete this.muteFiltersDraftObject[id] this.unsetPreference({ path: 'simple.muteFilters.' + id, value: null }) - this.pushServerSideStorage() + this.pushSyncConfig() }, purgeExpiredFilters() { this.muteFiltersExpired.forEach(([id]) => { delete this.muteFiltersDraftObject[id] this.unsetPreference({ path: 'simple.muteFilters.' + id, value: null }) }) - this.pushServerSideStorage() + this.pushSyncConfig() }, updateFilter(id, field, value) { const filter = { ...this.muteFiltersDraftObject[id] } @@ -253,7 +253,7 @@ const FilteringTab = { path: 'simple.muteFilters.' + id, value: this.muteFiltersDraftObject[id], }) - this.pushServerSideStorage() + this.pushSyncConfig() this.muteFiltersDraftDirty[id] = false }, }, diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js index 0d8f9a786..3f777f51f 100644 --- a/src/components/settings_modal/tabs/general_tab.js +++ b/src/components/settings_modal/tabs/general_tab.js @@ -11,6 +11,7 @@ import UnitSetting from '../helpers/unit_setting.vue' import { useInstanceStore } from 'src/stores/instance.js' import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import localeService from 'src/services/locale/locale.service.js' @@ -48,6 +49,9 @@ const GeneralTab = { }, ...SharedComputedObject(), ...mapState(useInstanceCapabilitiesStore, ['blockExpiration']), + ...mapState(useSyncConfigStore, { + theme3hacks: (store) => store.mergedConfig.theme3hacks, + }), }, methods: { updateProfile() { diff --git a/src/components/status/status.js b/src/components/status/status.js index fbea34b4b..786864244 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -22,7 +22,7 @@ import UserPopover from '../user_popover/user_popover.vue' import { useInstanceStore } from 'src/stores/instance.js' import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' -import { useServerSideStorageStore } from 'src/stores/serverSideStorage' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' @@ -259,9 +259,7 @@ const Status = { }, muteFilterHits() { return muteFilterHits( - Object.values( - useServerSideStorageStore().prefsStorage.simple.muteFilters, - ), + Object.values(useSyncConfigStore().prefsStorage.simple.muteFilters), this.status, ) }, diff --git a/src/components/status_action_buttons/status_action_buttons.js b/src/components/status_action_buttons/status_action_buttons.js index 2e08797c8..9938e6382 100644 --- a/src/components/status_action_buttons/status_action_buttons.js +++ b/src/components/status_action_buttons/status_action_buttons.js @@ -5,7 +5,7 @@ import Popover from 'src/components/popover/popover.vue' import ActionButtonContainer from './action_button_container.vue' import { BUTTONS } from './buttons_definitions.js' -import { useServerSideStorageStore } from 'src/stores/serverSideStorage.js' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import genRandomSeed from 'src/services/random_seed/random_seed.service.js' @@ -36,7 +36,7 @@ const StatusActionButtons = { ActionButtonContainer, }, computed: { - ...mapState(useServerSideStorageStore, { + ...mapState(useSyncConfigStore, { pinnedItems: (store) => new Set(store.prefsStorage.collections.pinnedStatusActions), }), @@ -111,18 +111,18 @@ const StatusActionButtons = { return this.pinnedItems.has(button.name) }, unpin(button) { - useServerSideStorageStore().removeCollectionPreference({ + useSyncConfigStore().removeCollectionPreference({ path: 'collections.pinnedStatusActions', value: button.name, }) - useServerSideStorageStore().pushServerSideStorage() + useSyncConfigStore().pushSyncConfig() }, pin(button) { - useServerSideStorageStore().addCollectionPreference({ + useSyncConfigStore().addCollectionPreference({ path: 'collections.pinnedStatusActions', value: button.name, }) - useServerSideStorageStore().pushServerSideStorage() + useSyncConfigStore().pushSyncConfig() }, getComponent(button) { if (!this.$store.state.users.currentUser && button.anonLink) { diff --git a/src/components/update_notification/update_notification.js b/src/components/update_notification/update_notification.js index a8bc60676..78aaa79e8 100644 --- a/src/components/update_notification/update_notification.js +++ b/src/components/update_notification/update_notification.js @@ -1,7 +1,7 @@ import Modal from 'src/components/modal/modal.vue' import { useInstanceStore } from 'src/stores/instance.js' -import { useServerSideStorageStore } from 'src/stores/serverSideStorage.js' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import pleromaTanFoxMask from 'src/assets/pleromatan_apology_fox_mask.png' import pleromaTanMask from 'src/assets/pleromatan_apology_mask.png' @@ -41,9 +41,9 @@ const UpdateNotification = { return ( !useInstanceStore().disableUpdateNotification && this.$store.state.users.currentUser && - useServerSideStorageStore().flagStorage.updateCounter < + useSyncConfigStore().flagStorage.updateCounter < CURRENT_UPDATE_COUNTER && - !useServerSideStorageStore().prefsStorage.simple.dontShowUpdateNotifs + !useSyncConfigStore().prefsStorage.simple.dontShowUpdateNotifs ) }, }, @@ -53,22 +53,22 @@ const UpdateNotification = { }, neverShowAgain() { this.toggleShow() - useServerSideStorageStore().setFlag({ + useSyncConfigStore().setFlag({ flag: 'updateCounter', value: CURRENT_UPDATE_COUNTER, }) - useServerSideStorageStore().setPreference({ + useSyncConfigStore().setPreference({ path: 'simple.dontShowUpdateNotifs', value: true, }) - useServerSideStorageStore().pushServerSideStorage() + useSyncConfigStore().pushSyncConfig() }, dismiss() { - useServerSideStorageStore().setFlag({ + useSyncConfigStore().setFlag({ flag: 'updateCounter', value: CURRENT_UPDATE_COUNTER, }) - useServerSideStorageStore().pushServerSideStorage() + useSyncConfigStore().pushSyncConfig() }, }, mounted() { diff --git a/src/modules/config.js b/src/modules/config.js index 82acf8162..b68d547df 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -3,7 +3,7 @@ import { set } from 'lodash' import messages from '../i18n/messages' import localeService from '../services/locale/locale.service.js' -import { applyConfig } from '../services/style_setter/style_setter.js' +import { applyStyleConfig } from '../services/style_setter/style_setter.js' import { defaultState, instanceDefaultConfig } from './default_config_state.js' import { useEmojiStore } from 'src/stores/emoji.js' @@ -71,7 +71,7 @@ const config = { mutations: { setOptionTemporarily(state, { name, value }) { set(state, name, value) - applyConfig(state) + applyStyleConfig(state) }, setOption(state, { name, value }) { set(state, name, value) @@ -162,7 +162,7 @@ const config = { } else { commit('setOption', { name, value }) if (APPEARANCE_SETTINGS_KEYS.has(name)) { - applyConfig(state) + applyStyleConfig(state) } if (name.startsWith('theme3hacks')) { dispatch('applyTheme', { recompile: true }) diff --git a/src/modules/default_config_state.js b/src/modules/default_config_state.js index 1e9726b91..2f18fe9a5 100644 --- a/src/modules/default_config_state.js +++ b/src/modules/default_config_state.js @@ -1,4 +1,4 @@ -const browserLocale = (window.navigator.language || 'en').split('-')[0] +const browserLocale = (navigator.language || 'en').split('-')[0] /// Instance config entries provided by static config or pleroma api /// Put settings here only if it does not make sense for a normal user diff --git a/src/modules/notifications.js b/src/modules/notifications.js index cb3d430db..9507177a2 100644 --- a/src/modules/notifications.js +++ b/src/modules/notifications.js @@ -10,7 +10,7 @@ import { } from '../services/notification_utils/notification_utils.js' import { useReportsStore } from 'src/stores/reports.js' -import { useServerSideStorageStore } from 'src/stores/serverSideStorage.js' +import { useSyncConfigStore } from 'src/stores/sync_config.js' const emptyNotifications = () => ({ desktopNotificationSilence: true, @@ -119,9 +119,7 @@ export const notifications = { maybeShowNotification( store, - Object.values( - useServerSideStorageStore().prefsStorage.simple.muteFilters, - ), + Object.values(useSyncConfigStore().prefsStorage.simple.muteFilters), notification, ) } else if (notification.seen) { diff --git a/src/modules/users.js b/src/modules/users.js index b0febcd3a..ea2a0ccb4 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -26,7 +26,7 @@ import { useInstanceStore } from 'src/stores/instance.js' import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' import { useInterfaceStore } from 'src/stores/interface.js' import { useOAuthStore } from 'src/stores/oauth.js' -import { useServerSideStorageStore } from 'src/stores/serverSideStorage' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import { declarations } from 'src/modules/config_declaration' @@ -682,7 +682,7 @@ const users = { useInterfaceStore().setLastTimeline('public-timeline') useInterfaceStore().setLayoutWidth(windowWidth()) useInterfaceStore().setLayoutHeight(windowHeight()) - store.commit('clearServerSideStorage') + //useSyncConfigStore().clearSyncConfig() }) }, loginUser(store, accessToken) { @@ -702,7 +702,7 @@ const users = { user.domainMutes = [] commit('setCurrentUser', user) - useServerSideStorageStore().setServerSideStorage(user) + useSyncConfigStore().setSyncConfig(user) commit('addNewUsers', [user]) useEmojiStore().fetchEmoji() @@ -723,17 +723,16 @@ const users = { /* // Reset wordfilter Object.keys( - useServerSideStorageStore().prefsStorage.simple.muteFilters + useSyncConfigStore().prefsStorage.simple.muteFilters ).forEach(key => { - useServerSideStorageStore().unsetPreference({ path: 'simple.muteFilters.' + key, value: null }) + useSyncConfigStore().unsetPreference({ path: 'simple.muteFilters.' + key, value: null }) }) // Reset flag to 0 to re-run migrations - useServerSideStorageStore().setFlag({ flag: 'configMigration', value: 0 }) + useSyncConfigStore().setFlag({ flag: 'configMigration', value: 0 }) /**/ - const { configMigration } = - useServerSideStorageStore().flagStorage + const { configMigration } = useSyncConfigStore().flagStorage declarations .filter((x) => { return ( @@ -744,12 +743,12 @@ const users = { }) .toSorted((a, b) => a.configMigration - b.configMigration) .forEach((value) => { - value.migration(useServerSideStorageStore(), store.rootState) - useServerSideStorageStore().setFlag({ + value.migration(useSyncConfigStore(), store.rootState) + useSyncConfigStore().setFlag({ flag: 'configMigration', value: value.migrationNum, }) - useServerSideStorageStore().pushServerSideStorage() + useSyncConfigStore().pushSyncConfig() }) if (user.token) {