From bed32b94d2dde3fa30c66e246dc5c4f06d9cc488 Mon Sep 17 00:00:00 2001 From: KMY Date: Sun, 2 Jul 2023 10:25:52 +0900 Subject: [PATCH] Fix searchability logic --- app/models/status.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/status.rb b/app/models/status.rb index ee20b42a99..da1e38385e 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -384,11 +384,15 @@ class Status < ApplicationRecord end def compute_searchability - return 'direct' if searchability && unsupported_searchability? + return 'direct' if unsupported_searchability? return searchability if account.local? && !searchability.nil? return 'direct' if account.local? || [:public, :private, :direct, :limited].exclude?(account.searchability.to_sym) - Status.searchabilities[[Account.searchabilities[account.searchability] || 3, Status.searchabilities[searchability.nil? ? 'direct' : searchability] || 3].max] || 'direct' + account_searchability = Account.searchabilities[account.searchability] + account_searchability = 3 if account.searchability != 'public' && !account_searchability + status_searchability = Status.searchabilities[searchability.nil? ? 'direct' : searchability] + status_searchability = 3 if searchability.nil? || (searchability != 'public' && !status_searchability) + Status.searchabilities[[account_searchability, status_searchability].max] || 'direct' end def compute_searchability_activitypub