Merge pull request 'Synchronized Settings' (#3473) from setttingssync into develop

Reviewed-on: https://git.pleroma.social/pleroma/pleroma-fe/pulls/3473

src/components/post_status_form/post_status_form.js

@@ -25,6 +25,8 @@ import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMediaViewerStore } from 'src/stores/media_viewer.js'
+import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useSyncConfigStore } from 'src/stores/sync_config.js'
 
 import { pollFormToMasto } from 'src/services/poll/poll.service.js'
 
@@ -170,7 +172,7 @@ const PostStatusForm = {
     const preset = this.$route.query.message
     let statusText = preset || ''
 
-    const { scopeCopy } = this.$store.getters.mergedConfig
+    const { scopeCopy } = useMergedConfigStore().mergedConfig
 
     const [statusType, refId] = typeAndRefId({
       replyTo: this.replyTo,
@@ -200,7 +202,7 @@ const PostStatusForm = {
           : this.$store.state.users.currentUser.default_scope
 
       const { postContentType: contentType, sensitiveByDefault } =
-        this.$store.getters.mergedConfig
+        useMergedConfigStore().mergedConfig
 
       statusParams = {
         type: statusType,
@@ -301,7 +303,7 @@ const PostStatusForm = {
       return this.newStatus.spoilerText.length
     },
     statusLengthLimit() {
-      return useInstanceStore().textlimit
+      return useInstanceStore().limits.textLimit
     },
     hasStatusLengthLimit() {
       return this.statusLengthLimit > 0
@@ -335,7 +337,8 @@ const PostStatusForm = {
     },
     hideScopeNotice() {
       return (
-        this.disableNotice || this.$store.getters.mergedConfig.hideScopeNotice
+        this.disableNotice ||
+        useMergedConfigStore().mergedConfig.hideScopeNotice
       )
     },
     pollContentError() {
@@ -420,7 +423,7 @@ const PostStatusForm = {
       return this.newStatus.hasQuote && !this.newStatus.quote.thread
     },
     shouldAutoSaveDraft() {
-      return this.$store.getters.mergedConfig.autoSaveDraft
+      return useMergedConfigStore().mergedConfig.autoSaveDraft
     },
     autoSaveState() {
       if (this.saveable) {
@@ -453,7 +456,7 @@ const PostStatusForm = {
         )
       )
     },
-    ...mapGetters(['mergedConfig']),
+    ...mapState(useMergedConfigStore, ['mergedConfig']),
     ...mapState(useInterfaceStore, {
       mobileLayout: (store) => store.mobileLayout,
     }),
@@ -879,8 +882,8 @@ const PostStatusForm = {
       this.newStatus.hasQuote = !this.newStatus.hasQuote
     },
     dismissScopeNotice() {
-      this.$store.dispatch('setOption', {
-        name: 'hideScopeNotice',
+      useSyncConfigStore().setSimplePrefAndSave({
+        path: 'hideScopeNotice',
         value: true,
       })
     },

src/components/post_status_form/post_status_form.scss

@@ -111,7 +111,6 @@
   .visibility-notice {
     border: 1px solid var(--border);
     border-radius: var(--roundness);
-    padding: 0.5em 1em
   }
 
   .visibility-notice.edit-warning {

src/components/post_status_form/post_status_form.vue

@@ -9,20 +9,24 @@
       @dragover.prevent="fileDrag"
     >
       <div class="form-group">
-        <i18n-t
+        <div
           v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private' && !disableLockWarning"
-          keypath="post_status.account_not_locked_warning"
-          tag="p"
-          class="visibility-notice"
-          scope="global"
+          class="visibility-notice notice-dismissible"
         >
-          <button
-            class="button-unstyled -link"
-            @click="openProfileTab"
+          <i18n-t
+            keypath="post_status.account_not_locked_warning"
+            tag="p"
+            class=""
+            scope="global"
           >
-            {{ $t('post_status.account_not_locked_warning_link') }}
-          </button>
-        </i18n-t>
+            <button
+              class="button-unstyled -link"
+              @click="openProfileTab"
+            >
+              {{ $t('post_status.account_not_locked_warning_link') }}
+            </button>
+          </i18n-t>
+        </div>
         <p
           v-if="!hideScopeNotice && newStatus.visibility === 'public'"
           class="visibility-notice notice-dismissible"
@@ -70,7 +74,7 @@
         </p>
         <p
           v-else-if="newStatus.visibility === 'direct'"
-          class="visibility-notice"
+          class="visibility-notice notice-dismissible"
         >
           <span v-if="safeDMEnabled">{{ $t('post_status.direct_warning_to_first_only') }}</span>
           <span v-else>{{ $t('post_status.direct_warning_to_all') }}</span>