Merge branch 'instance-migration' into shigusegubu-themes3

src/App.js

@@ -199,7 +199,7 @@ export default {
       'styleDataUsed',
       'layoutType',
     ]),
-    ...mapState(useInstanceStore, ['styleDataUsed', 'private']),
+    ...mapState(useInstanceStore, ['styleDataUsed']),
     ...mapState(useInstanceCapabilitiesStore, [
       'suggestionsEnabled',
       'editingAvailable',

src/boot/after_store.js

@@ -393,7 +393,7 @@ const getNodeInfo = async ({ store }) => {
       })
 
       const priv = metadata.private
-      useInstanceStore().set({ name: 'private', value: priv })
+      useInstanceStore().set({ name: 'privateMode', value: priv })
 
       const frontendVersion = window.___pleromafe_commit_hash
       useInstanceStore().set({

src/components/desktop_nav/desktop_nav.js

@@ -83,7 +83,7 @@ export default {
             },
       )
     },
-    ...mapState(useInstanceStore, ['private']),
+    ...mapState(useInstanceStore, ['privateMode']),
     ...mapState(useInstanceStore, {
       logoMask: (store) => store.instanceIdentity.logoMask,
       logo: (store) => store.instanceIdentity.logo,

src/components/desktop_nav/desktop_nav.vue

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

src/components/lists_menu/lists_menu_content.js

@@ -16,7 +16,6 @@ export const ListsMenuContent = {
     ...mapPiniaState(useListsStore, {
       lists: getListEntries,
     }),
-    ...mapPiniaState(useInstanceStore, ['private', 'federating']),
     ...mapState({
       currentUser: (state) => state.users.currentUser,
     }),

src/components/navigation/navigation_pins.js

@@ -74,7 +74,7 @@ const NavPanel = {
       pinnedItems: (store) =>
         new Set(store.prefsStorage.collections.pinnedNavItems),
     }),
-    ...mapPiniaState(useInstanceStore, ['private', 'federating']),
+    ...mapPiniaState(useInstanceStore, ['privateMode', 'federating']),
     ...mapPiniaState(useInstanceCapabilitiesStore, [
       'pleromaChatMessagesAvailable',
       'localBubble',
@@ -95,7 +95,7 @@ const NavPanel = {
             hasChats: this.pleromaChatMessagesAvailable,
             hasAnnouncements: this.supportsAnnouncements,
             isFederating: this.federating,
-            isPrivate: this.private,
+            isPrivate: this.privateMode,
             currentUser: this.currentUser,
             supportsBubbleTimeline: this.localBubble,
             supportsBookmarkFolders: this.bookmarks,
@@ -119,7 +119,7 @@ const NavPanel = {
           supportsBubbleTimeline: this.localBubble,
           supportsBookmarkFolders: this.bookmarks,
           isFederating: this.federating,
-          isPrivate: this.private,
+          isPrivate: this.privateMode,
           currentUser: this.currentUser,
         },
       ).slice(0, this.limit)

src/components/side_drawer/side_drawer.js

@@ -100,7 +100,7 @@ const SideDrawer = {
       'pleromaChatMessagesAvailable',
       'suggestionsEnabled',
     ]),
-    ...mapState(useInstanceStore, ['private', 'federating']),
+    ...mapState(useInstanceStore, ['privateMode', 'federating']),
     ...mapState(useInstanceStore, {
       logo: (store) => store.instanceIdentity.logo,
       sitename: (store) => store.instanceIdentity.name,

src/components/side_drawer/side_drawer.vue

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

src/components/status_action_buttons/action_button.js

@@ -94,7 +94,8 @@ export default {
       return this.status.thread_muted
     },
     hideCustomEmoji() {
-      return !useInstanceCapabilitiesStore().pleromaCustomEmojiReactionsAvailable
+      return !useInstanceCapabilitiesStore()
+        .pleromaCustomEmojiReactionsAvailable
     },
     buttonInnerClass() {
       return [

src/components/timeline_menu/timeline_menu.js

@@ -68,7 +68,7 @@ const TimelineMenu = {
       'bookmarkFolders',
       'localBubble',
     ]),
-    ...mapPiniaState(useInstanceStore, ['private', 'federating']),
+    ...mapPiniaState(useInstanceStore, ['privateMode', 'federating']),
     ...mapState({
       currentUser: (state) => state.users.currentUser,
     }),
@@ -78,7 +78,7 @@ const TimelineMenu = {
         {
           hasChats: this.pleromaChatMessagesAvailable,
           isFederating: this.federating,
-          isPrivate: this.private,
+          isPrivate: this.privateMode,
           currentUser: this.currentUser,
           supportsBookmarkFolders: this.pleromaBookmarkFoldersAvailable,
           supportsBubbleTimeline: this.localBubble,

src/stores/instance.js

@@ -20,7 +20,7 @@ const defaultState = {
   registrationOpen: true,
   server: 'http://localhost:4040/',
   textlimit: 5000,
-  private: false,
+  privateMode: false,
   federating: true,
   federationPolicy: null,
   themesIndex: null,