From bbef4e40dffd012dafed71e6efff5c05e7308c3e Mon Sep 17 00:00:00 2001
From: Alexander Tumin <iamtakingiteasy@eientei.org>
Date: Mon, 7 Oct 2024 13:39:36 +0300
Subject: [PATCH] Fix whitespaces for multiple status mute reasons, display bot
 status reason

---
 changelog.d/multiple-status-mute-reasons.fix  |  1 +
 src/components/notification/notification.scss |  1 +
 src/components/status/status.scss             |  1 +
 src/components/status/status.vue              | 21 ++++++++++++-------
 src/i18n/en.json                              |  1 +
 5 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 changelog.d/multiple-status-mute-reasons.fix

diff --git a/changelog.d/multiple-status-mute-reasons.fix b/changelog.d/multiple-status-mute-reasons.fix
new file mode 100644
index 00000000..952ccea8
--- /dev/null
+++ 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
index 2dbced09..0ca6aea7 100644
--- 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
index 63809ff2..344e4b8e 100644
--- 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
index 61a58cda..7fef69df 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -36,17 +36,24 @@
         >
           {{ $t('status.sensitive_muted') }}
         </small>
+        <small
+          v-if="muteBotStatuses && botStatus"
+          class="mute-thread"
+        >
+          {{ $t('status.bot_muted') }}
+        </small>
         <small
           v-if="showReasonMutedThread"
           class="mute-thread"
         >
-          {{ $t('status.thread_muted') }}
-        </small>
-        <small
-          v-if="showReasonMutedThread && muteWordHits.length > 0"
-          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
index 74cddea8..c86bdbab 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1151,6 +1151,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",