From ffd684b3305c46b3f2f91a42f38fc29ef51ed9c6 Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Tue, 12 Sep 2023 17:56:04 +0900
Subject: [PATCH] Fix tag bar is not showing

---
 app/javascript/mastodon/components/status.jsx                   | 2 +-
 .../mastodon/features/status/components/detailed_status.jsx     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 682051c7d559f5..a9970ad26306f8 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -623,7 +623,7 @@ class Status extends ImmutablePureComponent {
 
             {(!isCardMediaWithSensitive || !status.get('hidden')) && media}
 
-            {expanded && hashtagBar}
+            {(!status.get('spoiler_text') || expanded) && hashtagBar}
 
             {emojiReactionsBar}
 
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index a3f48490edd635..ba22710f9c5da0 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -400,7 +400,7 @@ class DetailedStatus extends ImmutablePureComponent {
 
           {(!isCardMediaWithSensitive || !status.get('hidden')) && media}
 
-          {expanded && hashtagBar}
+          {(!status.get('spoiler_text') || expanded) && hashtagBar}
 
           {emojiReactionsBar}