From 498dc2ccce994a37a6b5eac73eddf9ced49873c4 Mon Sep 17 00:00:00 2001 From: KMY Date: Fri, 7 Apr 2023 13:48:44 +0900 Subject: [PATCH] Remove searchability support from public_feed --- app/models/public_feed.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/models/public_feed.rb b/app/models/public_feed.rb index d7db5c3090..8be8f87553 100644 --- a/app/models/public_feed.rb +++ b/app/models/public_feed.rb @@ -29,7 +29,6 @@ class PublicFeed scope.merge!(account_filters_scope) if account? scope.merge!(media_only_scope) if media_only? scope.merge!(language_scope) if account&.chosen_languages.present? - scope.merge!(public_searchable_scope) if local_only? && !account? scope.cache_ids.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id) end @@ -98,10 +97,6 @@ class PublicFeed Status.where(language: account.chosen_languages) end - def public_searchable_scope - Status.where(searchability: 'public').or(Status.where(searchability: nil).merge(Account.where(searchability: 'public'))) - end - def account_filters_scope Status.not_excluded_by_account(account).tap do |scope| scope.merge!(Status.not_domain_blocked_by_account(account)) unless local_only?