From e726982065ff140c04bb5f04a1f963d518f9b53b Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Thu, 25 May 2023 14:46:34 +0900
Subject: [PATCH] Fix searchability=4 error

---
 app/models/account.rb                      | 2 +-
 app/models/status.rb                       | 2 +-
 app/serializers/rest/account_serializer.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index 357d62404a..2bf9be7b97 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -86,7 +86,7 @@ class Account < ApplicationRecord
 
   enum protocol: { ostatus: 0, activitypub: 1 }
   enum suspension_origin: { local: 0, remote: 1 }, _prefix: true
-  enum searchability: { public: 0, unlisted: 1, private: 2, direct: 3, limited: 4, public_unlisted: 10 }, _suffix: :searchability
+  enum searchability: { public: 0, private: 1, direct: 2, limited: 3, unsupported: 4, public_unlisted: 10 }, _suffix: :searchability
 
   validates :username, presence: true
   validates_with UniqueUsernameValidator, if: -> { will_save_change_to_username? }
diff --git a/app/models/status.rb b/app/models/status.rb
index b6f5ac1152..2f275cbd86 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -388,7 +388,7 @@ class Status < ApplicationRecord
     # searchability || Status.searchabilities.invert.fetch([Account.searchabilities[account.searchability], Status.visibilities[visibility] || 0].max, nil) || 'direct'
     # Reactions only (generic: direct)
     return searchability if searchability
-    return account.searchability if account.local? && account.searchability
+    return account.searchability if account.local? && account.searchability && !account.unsupported_searchability?
 
     'direct'
   end
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index a8355c7063..dbd6ab2186 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -5,7 +5,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
   include FormattingHelper
 
   attributes :id, :username, :acct, :display_name, :locked, :bot, :discoverable, :group, :created_at,
-             :note, :url, :avatar, :avatar_static, :header, :header_static, :searchability, :subscribable,
+             :note, :url, :avatar, :avatar_static, :header, :header_static, :subscribable,
              :followers_count, :following_count, :statuses_count, :last_status_at, :other_settings,
              :noindex