Merge branch 'more-fixes' into shigusegubu-themes3

src/boot/after_store.js

@@ -468,7 +468,7 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => {
   app.use(pinia)
 
   app.config.errorHandler = (error, instance, info) => {
-    console.error('GLOBAL ERROR HANDLER', error, instance, info)
+    console.error('Global Vue Error Handler caught an error:', error, instance, info)
     useInterfaceStore().setGlobalError({ error, instance, info })
   }
 

src/components/draft/draft.js

@@ -69,15 +69,6 @@ const Draft = {
     localCollapseSubjectDefault() {
       return useMergedConfigStore().mergedConfig.collapseMessageWithSubject
     },
-    nsfwClickthrough() {
-      if (!this.draft.nsfw) {
-        return false
-      }
-      if (this.draft.summary && this.localCollapseSubjectDefault) {
-        return false
-      }
-      return true
-    },
   },
   watch: {
     editing(newVal) {

src/components/status_content/status_content.js

@@ -69,15 +69,6 @@ const StatusContent = {
           (this.mergedConfig.hideAttachmentsInConv && this.inConversation))
       )
     },
-    nsfwClickthrough() {
-      if (!this.status.nsfw) {
-        return false
-      }
-      if (this.status.summary && this.mergedConfig.collapseMessageWithSubject) {
-        return false
-      }
-      return true
-    },
     attachmentSize() {
       if (this.compact) {
         return 'small'

src/components/status_content/status_content.vue

@@ -33,7 +33,7 @@
         v-if="status.attachments.length !== 0"
         class="attachments media-body"
         :compact="compact"
-        :nsfw="nsfwClickthrough"
+        :nsfw="status.nsfw"
         :attachments="status.attachments"
         :limit="compact ? 1 : 0"
         :size="attachmentSize"
@@ -45,10 +45,10 @@
         v-if="statusCard && !compact"
         class="link-preview media-body"
       >
-        <link-preview
+        <LinkPreview
           :card="status.card"
           :size="attachmentSize"
-          :nsfw="nsfwClickthrough"
+          :nsfw="status.nsfw"
         />
       </div>
     </StatusBody>