pleroma-fe

commit: a7e1ce20bff8141640d55a914ec8dc04f5141322
parent 47edd347423f5bb312596dea850a40ba656e166d
Author: Henry Jameson <me@hjkos.com>
Date:   Mon, 25 Nov 2024 22:38:40 +0200

Merge remote-tracking branch 'origin/develop' into themes3-grand-finale-maybe

Diffstat:
A
changelog.d/multiple-status-mute-reasons.fix
1
+
M
src/components/notification/notification.scss
1
+
M
src/components/status/status.scss
1
+
M
src/components/status/status.vue
15
+++++++++++----
M
src/i18n/en.json
1
+

5 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/changelog.d/multiple-status-mute-reasons.fix b/changelog.d/multiple-status-mute-reasons.fix
@@ -0,0 +1 @@
+Fix whitespaces for multiple status mute reasons, display bot status reason
diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss
@@ -26,6 +26,7 @@
     overflow: hidden;
     display: flex;
     flex-wrap: nowrap;
+    gap: 1ex;
 
     & .status-username,
     & .mute-thread,
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
@@ -281,6 +281,7 @@
     overflow: hidden;
     display: flex;
     flex-wrap: nowrap;
+    gap: 1ex;
 
     & .status-username,
     & .mute-thread,
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
@@ -37,16 +37,23 @@
           {{ $t('status.sensitive_muted') }}
         </small>
         <small
-          v-if="showReasonMutedThread"
+          v-if="muteBotStatuses && botStatus"
           class="mute-thread"
         >
-          {{ $t('status.thread_muted') }}
+          {{ $t('status.bot_muted') }}
         </small>
         <small
-          v-if="showReasonMutedThread && muteWordHits.length > 0"
+          v-if="showReasonMutedThread"
           class="mute-thread"
         >
-          {{ $t('status.thread_muted_and_words') }}
+          <span>
+            {{ $t('status.thread_muted') }}
+          </span>
+          <span
+            v-if="muteWordHits.length > 0"
+          >
+            {{ $t('status.thread_muted_and_words') }}
+          </span>
         </small>
         <small
           class="mute-words"
diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -1229,6 +1229,7 @@
     "thread_muted": "Thread muted",
     "thread_muted_and_words": ", has words:",
     "sensitive_muted": "Muting sensitive content",
+    "bot_muted": "Muting bot content",
     "show_full_subject": "Show full subject",
     "hide_full_subject": "Hide full subject",
     "show_content": "Show content",