Merge branch 'instance-migration' into shigusegubu-themes3

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,

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 {

src/components/desktop_nav/desktop_nav.vue

@@ -33,7 +33,7 @@
       </router-link>
       <div class="item right actions">
         <search-bar
-          v-if="currentUser || !privateMode"
+          v-if="currentUser || !private"
           @toggled="onSearchBarToggled"
           @click.stop
         />

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,
     }),
   },
 }

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) =>

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) {

src/components/side_drawer/side_drawer.vue

@@ -47,7 +47,7 @@
           </router-link>
         </li>
         <li
-          v-if="currentUser || !privateMode"
+          v-if="currentUser || !private"
           @click="toggleDrawer"
         >
           <router-link
@@ -166,7 +166,7 @@
       </ul>
       <ul>
         <li
-          v-if="currentUser || !privateMode"
+          v-if="currentUser || !private"
           @click="toggleDrawer"
         >
           <router-link

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

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,