From 775a469507f2b2a4c7ca11b494720628838d0286 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 29 Jan 2026 21:24:02 +0200 Subject: [PATCH 1/4] fix background --- src/App.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/App.js b/src/App.js index 220f563f8..512853200 100644 --- a/src/App.js +++ b/src/App.js @@ -133,11 +133,8 @@ export default { userBackground() { return this.currentUser.background_image }, - instanceBackground() { - return this.mergedConfig.hideInstanceWallpaper ? null : this.background - }, background() { - return this.userBackground || this.instanceBackground + return this.userBackground || (this.mergedConfig.hideInstanceWallpaper ? null : this.instanceBackground) }, bgStyle() { if (this.background) { @@ -204,7 +201,7 @@ export default { ]), ...mapState(useInstanceStore, ['styleDataUsed', 'private']), ...mapState(useInstanceStore, { - background: (store) => store.instanceIdentity.background, + instanceBackground: (store) => store.instanceIdentity.background, showFeaturesPanel: (store) => store.instanceIdentity.showFeaturesPanel, showInstanceSpecificPanel: (store) => store.instanceIdentity.showInstanceSpecificPanel, From 6eb94da3e841d4ad8f3caaa9f872bab5fbbe2f7e Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 29 Jan 2026 21:24:21 +0200 Subject: [PATCH 2/4] make sw shut up --- src/sw.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sw.js b/src/sw.js index 38a2fe7b2..3e22cca68 100644 --- a/src/sw.js +++ b/src/sw.js @@ -39,7 +39,7 @@ const setSettings = async () => { const locale = vuexState.config.interfaceLanguage || 'en' i18n.locale = locale const notificationsNativeArray = Object.entries( - vuexState.config.notificationNative, + vuexState.config.notificationNative || {}, ) state.webPushAlwaysShowNotifications = vuexState.config.webPushAlwaysShowNotifications From e3a441310f1f25918dae61d41098644aad5c6be0 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 29 Jan 2026 21:32:37 +0200 Subject: [PATCH 3/4] fix/revert privateMode to avoid conflict with keyword --- src/components/desktop_nav/desktop_nav.vue | 2 +- src/components/lists_menu/lists_menu_content.js | 3 +-- src/components/nav_panel/nav_panel.js | 3 ++- src/components/side_drawer/side_drawer.js | 6 ------ src/components/side_drawer/side_drawer.vue | 4 ++-- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue index da427f2a1..676e2428f 100644 --- a/src/components/desktop_nav/desktop_nav.vue +++ b/src/components/desktop_nav/desktop_nav.vue @@ -33,7 +33,7 @@
diff --git a/src/components/lists_menu/lists_menu_content.js b/src/components/lists_menu/lists_menu_content.js index 2279ca6f0..49b413b4f 100644 --- a/src/components/lists_menu/lists_menu_content.js +++ b/src/components/lists_menu/lists_menu_content.js @@ -16,10 +16,9 @@ export const ListsMenuContent = { ...mapPiniaState(useListsStore, { lists: getListEntries, }), + ...mapPiniaState(useInstanceStore, ['private','federating']), ...mapState({ currentUser: (state) => state.users.currentUser, - privateMode: (state) => useInstanceStore().private, - federating: (state) => useInstanceStore().federating, }), }, } diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js index 5ea5faef3..eb10c8148 100644 --- a/src/components/nav_panel/nav_panel.js +++ b/src/components/nav_panel/nav_panel.js @@ -112,8 +112,9 @@ const NavPanel = { unreadAnnouncementCount: 'unreadAnnouncementCount', supportsAnnouncements: (store) => store.supportsAnnouncements, }), - ...mapPiniaState(useInstanceStore, ['private', 'federating']), + ...mapPiniaState(useInstanceStore, ['federating']), ...mapPiniaState(useInstanceStore, { + privateMode: (store) => store.private, pleromaChatMessagesAvailable: (store) => store.featureSet.pleromaChatMessagesAvailable, bookmarkFolders: (store) => diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js index 0f7b06990..40fcdc23d 100644 --- a/src/components/side_drawer/side_drawer.js +++ b/src/components/side_drawer/side_drawer.js @@ -79,12 +79,6 @@ const SideDrawer = { followRequestCount() { return this.$store.state.api.followRequests.length }, - privateMode() { - return useInstanceStore().private - }, - federating() { - return useInstanceStore().federating - }, timelinesRoute() { let name if (useInterfaceStore().lastTimeline) { diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue index c034edf91..0db39d43f 100644 --- a/src/components/side_drawer/side_drawer.vue +++ b/src/components/side_drawer/side_drawer.vue @@ -47,7 +47,7 @@
    • Date: Thu, 29 Jan 2026 21:32:53 +0200 Subject: [PATCH 4/4] fix ISP (again) --- src/boot/after_store.js | 2 +- vite.config.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/boot/after_store.js b/src/boot/after_store.js index a970d25cc..79ff631ca 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -201,7 +201,7 @@ const getInstancePanel = async ({ store }) => { if (res.ok) { const html = await res.text() useInstanceStore().set({ - name: 'instanceIdentity.instanceSpecificPanelContent', + path: 'instanceIdentity.instanceSpecificPanelContent', value: html, }) } else { diff --git a/vite.config.js b/vite.config.js index 2b6187413..401cb4b35 100644 --- a/vite.config.js +++ b/vite.config.js @@ -88,6 +88,11 @@ export default defineConfig(async ({ mode, command }) => { changeOrigin: true, cookieDomainRewrite: 'localhost', }, + '/instance': { + target, + changeOrigin: true, + cookieDomainRewrite: 'localhost', + }, '/socket': { target, changeOrigin: true,