From 55f59b4343c593b3f847419da2aee6857c06699b Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Sun, 9 Apr 2023 09:21:10 +0900
Subject: [PATCH] Fix status visibility_ex error

---
 app/javascript/mastodon/actions/importer/normalizer.js | 4 ++++
 app/javascript/mastodon/components/status.jsx          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index 4a69a29c9f..69d6bf03da 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -74,6 +74,10 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.media_attachments = status.media_attachments.concat(status.media_attachments_ex);
   }
 
+  if (!status.visibility_ex) {
+    normalStatus.visibility_ex = status.visibility;
+  }
+
   // Only calculate these values when status first encountered and
   // when the underlying values change. Otherwise keep the ones
   // already in the reducer
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 7f387d29dc..d29ee0dc99 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -512,7 +512,7 @@ class Status extends ImmutablePureComponent {
       'direct': { icon: 'at', text: intl.formatMessage(messages.direct_short) },
     };
 
-    const visibilityIcon = visibilityIconInfo[status.get('visibility_ex')];
+    const visibilityIcon = visibilityIconInfo[status.get('visibility_ex')] || visibilityIconInfo[status.get('visibility')];
 
     let emojiReactionsBar = null;
     if (!this.props.withoutEmojiReactions && status.get('emoji_reactions')) {