Merge branch 'setttingssync' into shigusegubu-themes3

src/components/password_reset/password_reset.vue

@@ -61,15 +61,16 @@
           </div>
           <p
             v-if="error"
-            class="alert error notice-dismissible"
+            class="alert error"
           >
             <span>{{ error }}</span>
-            <a
+            <button
               class="fa-scale-110 fa-old-padding dismiss"
+              type="button"
               @click.prevent="dismissError()"
             >
               <FAIcon icon="times" />
-            </a>
+            </button>
           </p>
         </div>
       </form>
@@ -117,10 +118,6 @@
     margin: 0.3em 0 1em;
   }
 
-  .notice-dismissible {
-    padding-right: 2rem;
-  }
-
   .dismiss {
     cursor: pointer;
   }

src/components/post_status_form/post_status_form.vue

@@ -9,20 +9,22 @@
       @dragover.prevent="fileDrag"
     >
       <div class="form-group">
-        <i18n-t
+        <div class="visibility-notice notice-dismissible">
-          v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private' && !disableLockWarning"
+          <i18n-t
-          keypath="post_status.account_not_locked_warning"
+            v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private' && !disableLockWarning"
-          tag="p"
+            keypath="post_status.account_not_locked_warning"
-          class="visibility-notice notice-dismissible"
+            tag="p"
-          scope="global"
+            class=""
-        >
+            scope="global"
-          <button
-            class="button-unstyled -link"
-            @click="openProfileTab"
           >
-            {{ $t('post_status.account_not_locked_warning_link') }}
+            <button
-          </button>
+              class="button-unstyled -link"
-        </i18n-t>
+              @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"

src/components/status/status.vue

@@ -10,12 +10,13 @@
       class="alert error"
     >
       {{ error }}
-      <span
+      <button
         class="fa-scale-110 fa-old-padding"
+        type="button"
         @click="clearError"
       >
         <FAIcon icon="times" />
-      </span>
+      </button>
     </div>
     <template v-if="muted && !isPreview">
       <div class="status-container muted">

src/components/status_action_buttons/action_button.vue

@@ -88,7 +88,7 @@
         <StatusBookmarkFolderMenu
           v-if="button.name === 'bookmark'"
           :status="status"
-          @close="() => { close(); outerClose() }"
+          @close="() => { close(); outerClose?.() }"
         />
       </template>
     </Popover>

src/services/entity_normalizer/entity_normalizer.service.js

@@ -372,8 +372,8 @@ export const parseStatus = (data) => {
     const quoteData = quoteRaw ? parseStatus(quoteRaw) : undefined
     output.quote = quoteData
     output.quote_id =
-      data.quote?.id ?? data.quote_id ?? quoteData?.id ?? pleroma.quote_id
+      data.quote?.id ?? data.quote_id ?? quoteData?.id ?? pleroma?.quote_id
-    output.quote_url = data.quote?.url ?? quoteData?.url ?? pleroma.quote_url
+    output.quote_url = data.quote?.url ?? quoteData?.url ?? pleroma?.quote_url
 
     output.in_reply_to_status_id = data.in_reply_to_id
     output.in_reply_to_user_id = data.in_reply_to_account_id

src/services/user_highlighter/user_highlighter.js

@@ -2,7 +2,7 @@ import { hex2rgb } from '../color_convert/color_convert.js'
 
 const highlightStyle = (prefs) => {
   if (prefs === undefined) return
-  const { color, type } = prefs
+  const { color = '#FFFFFF', type } = prefs
   if (typeof color !== 'string') return
   const rgb = hex2rgb(color)
   if (rgb == null) return

src/stores/interface.js

@@ -91,7 +91,8 @@ export const useInterfaceStore = defineStore('interface', {
     },
     setPageTitle(option = '') {
       try {
-        document.title = `${option} ${useInstanceStore().name}`
+        console.log('TITLE', option, useInstanceStore().instanceIdentity.name)
+        document.title = `${option} ${useInstanceStore().instanceIdentity.name}`
       } catch (error) {
         console.error(`${error}`)
       }