Merge branch 'instance-migration' into shigusegubu-themes3

src/components/emoji_input/emoji_input.js

@@ -9,8 +9,6 @@ import genRandomSeed from '../../services/random_seed/random_seed.service.js'
 import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue'
 
-import { useEmojiStore } from 'src/stores/emoji.js'
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faSmileBeam } from '@fortawesome/free-regular-svg-icons'
 
@@ -133,7 +131,7 @@ const EmojiInput = {
   },
   computed: {
     padEmoji() {
-      return useEmojiStore().mergedConfig.padEmoji
+      return this.$store.getters.mergedConfig.padEmoji
     },
     defaultCandidateIndex() {
       return this.$store.getters.mergedConfig.autocompleteSelect ? 0 : -1

src/components/features_panel/features_panel.js

@@ -3,17 +3,18 @@ import { mapState } from 'pinia'
 import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
 
 import { useInstanceStore } from 'src/stores/instance.js'
+import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 
 const FeaturesPanel = {
   computed: {
+    ...mapState(useInstanceCapabilitiesStore, [
+      'shoutAvailable',
+      'pleromaChatMessagesAvailable',
+      'gopherAvailable',
+      'suggestionsEnabled',
+      'mediaProxyAvailable',
+    ]),
     ...mapState(useInstanceStore, {
-      shout: (store) => store.shoutAvailable,
-      pleromaChatMessages: (store) =>
-        store.featureSet.pleromaChatMessagesAvailable,
-      gopher: (store) => store.featureSet.gopherAvailable,
-      whoToFollow: (store) => store.featureSet.suggestionsEnabled,
-      mediaProxy: (store) => store.featureSet.mediaProxyAvailable,
-      minimalScopesMode: (store) => store.prefsStorage.minimalScopesMode,
       textlimit: (store) => store.limits.textlimit,
       uploadlimit: (store) =>
         fileSizeFormatService.fileSizeFormat(store.limits.uploadlimit),

src/components/features_panel/features_panel.vue

@@ -8,19 +8,19 @@
       </div>
       <div class="panel-body">
         <ul>
-          <li v-if="shout">
+          <li v-if="shoutAvailable">
             {{ $t('features_panel.shout') }}
           </li>
-          <li v-if="pleromaChatMessages">
+          <li v-if="pleromaChatMessagesAvailable">
             {{ $t('features_panel.pleroma_chat_messages') }}
           </li>
-          <li v-if="gopher">
+          <li v-if="gopherAvailable">
             {{ $t('features_panel.gopher') }}
           </li>
-          <li v-if="whoToFollow">
+          <li v-if="suggestionsEnabled">
             {{ $t('features_panel.who_to_follow') }}
           </li>
-          <li v-if="mediaProxy">
+          <li v-if="mediaProxyAvailable">
             {{ $t('features_panel.media_proxy') }}
           </li>
           <li>{{ $t('features_panel.scope_options') }}</li>

src/modules/adminSettings.js

@@ -107,6 +107,12 @@ const adminSettingsStorage = {
           if (Array.isArray(value) && value.length > 0 && value[0].tuple) {
             if (!preserveTuples) {
               return value.reduce((acc, c) => {
+                if (c.tuple == null) {
+                  return {
+                    ...acc,
+                    [c]: c,
+                  }
+                }
                 return {
                   ...acc,
                   [c.tuple[0]]: convert(c.tuple[1], preserveTuplesLv2),

src/services/new_api/oauth.js

@@ -20,8 +20,10 @@ export const getJsonOrError = async (response) => {
 }
 
 export const createApp = (instance) => {
+  console.log('NAP', instance)
   const url = `${instance}/api/v1/apps`
   const form = new window.FormData()
+  console.log(url)
 
   form.append('client_name', 'PleromaFE')
   form.append('website', 'https://pleroma.social')

src/stores/oauth.js

@@ -83,6 +83,7 @@ export const useOAuthStore = defineStore('oauth', {
     },
     async getAppToken() {
       const instance = useInstanceStore().server
+      console.log(this.clientId)
       const res = await getClientToken({
         clientId: this.clientId,
         clientSecret: this.clientSecret,