From 55e10a2727e1ea9c41536a05ffb985c4dcebc995 Mon Sep 17 00:00:00 2001 From: KMY Date: Fri, 4 Aug 2023 14:23:52 +0900 Subject: [PATCH] Fix searchability logic from activitypub posts --- app/lib/activitypub/activity/create.rb | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index a38c4ecc0b..98db5802f6 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -507,18 +507,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity SCAN_SEARCHABILITY_FEDIBIRD_RE = /searchable_by_(all_users|followers_only|reacted_users_only|nobody)/ def searchability - searchability = searchability_from_audience || searchability_from_bio || (marked_as_misskey_searchability? ? :public : nil) - return nil if searchability.nil? - - visibility = visibility_from_audience_with_silence - - if searchability == visibility || searchability == :limited || searchability == :direct - searchability - elsif [:public, :unlisted, :private].include?(searchability) && [:private].include?(visibility) - :private - else - :direct - end + searchability_from_audience || searchability_from_bio || (marked_as_misskey_searchability? ? :public : nil) end def searchability_from_bio