Revert "Extended Search" to add in properly

This reverts commit 93a73ce9db.

.env.production.sample

@@ -238,7 +238,7 @@ SMTP_FROM_ADDRESS=notifications@example.com
 # SAML_ATTRIBUTES_STATEMENTS_FULL_NAME="urn:oid:2.16.840.1.113730.3.1.241"
 # SAML_ATTRIBUTES_STATEMENTS_FIRST_NAME="urn:oid:2.5.4.42"
 # SAML_ATTRIBUTES_STATEMENTS_LAST_NAME="urn:oid:2.5.4.4"
-# SAML_UID_ATTRIBUTE="urn:oid:0.9.2342.19200300.100.1.1"
+# SAML_UID_ATTRIBUTE="urn:oid:0.9.2342.19200300.100.1.1"
 # SAML_ATTRIBUTES_STATEMENTS_VERIFIED=
 # SAML_ATTRIBUTES_STATEMENTS_VERIFIED_EMAIL=
 
@@ -286,12 +286,6 @@ MAX_REACTIONS=1
 # Customize the number of hashtags shown in 'Explore'
 # MAX_TRENDING_TAGS=10
 
-# Scope of full-text searches:
-# - public: search any status with public visibility
-# - public_or_unlisted: search any status with public or unlisted visibility
-# - classic: searches only a user's own statuses, favs, bookmarks, and mentions
-# SEARCH_SCOPE=public
-
 # Maximum custom emoji file sizes
 # If undefined or smaller than MAX_EMOJI_SIZE, the value
 # of MAX_EMOJI_SIZE will be used for MAX_REMOTE_EMOJI_SIZE

app/chewy/statuses_index.rb

@@ -65,7 +65,6 @@ class StatusesIndex < Chewy::Index
   root date_detection: false do
     field :id, type: 'long'
     field :account_id, type: 'long'
-    field :visibility, type: 'keyword'
 
     field :text, type: 'text', value: ->(status) { status.searchable_text } do
       field :stemmed, type: 'text', analyzer: 'content'

app/lib/activitypub/activity/create.rb

@@ -85,8 +85,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
       attach_tags(@status)
     end
 
-    StatusesIndex.import! @status
-
     resolve_thread(@status)
     fetch_replies(@status)
     distribute

app/lib/importer/statuses_index_importer.rb

@@ -25,9 +25,7 @@ class Importer::StatusesIndexImporter < Importer::BaseImporter
           # on the results of the filter, so this filtering happens here instead
           bulk.map! do |entry|
             new_entry = begin
-              if entry[:index] &&
+              if entry[:index] && entry.dig(:index, :data, 'searchable_by').blank?
-                 entry.dig(:index, :data, 'searchable_by').blank? &&
-                 Rails.configuration.x.search_scope == :classic
                 { delete: entry[:index].except(:data) }
               else
                 entry
@@ -60,21 +58,13 @@ class Importer::StatusesIndexImporter < Importer::BaseImporter
   end
 
   def scopes
-    classic_scopes = [
+    [
       local_statuses_scope,
       local_mentions_scope,
       local_favourites_scope,
       local_votes_scope,
       local_bookmarks_scope,
     ]
-    case Rails.configuration.x.search_scope
-    when :public
-      classic_scopes + [public_scope]
-    when :public_or_unlisted
-      classic_scopes + [public_or_unlisted_scope]
-    else
-      classic_scopes
-    end
   end
 
   def local_mentions_scope
@@ -96,12 +86,4 @@ class Importer::StatusesIndexImporter < Importer::BaseImporter
   def local_statuses_scope
     Status.local.select('"statuses"."id", COALESCE("statuses"."reblog_of_id", "statuses"."id") AS status_id')
   end
-
-  def public_scope
-    Status.with_public_visibility.select('"statuses"."id", "statuses"."id" AS status_id')
-  end
-
-  def public_or_unlisted_scope
-    Status.with_public_or_unlisted_visibility.select('"statuses"."id", "statuses"."id" AS status_id')
-  end
 end

app/models/status.rb

@@ -104,7 +104,6 @@ class Status < ApplicationRecord
   scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') }
   scope :without_reblogs, -> { where('statuses.reblog_of_id IS NULL') }
   scope :with_public_visibility, -> { where(visibility: :public) }
-  scope :with_public_or_unlisted_visibility, -> { where(visibility: [:public, :unlisted]) }
   scope :tagged_with, ->(tag_ids) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag_ids }) }
   scope :excluding_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced_at: nil }) }
   scope :including_silenced_accounts, -> { left_outer_joins(:account).where.not(accounts: { silenced_at: nil }) }

app/services/activitypub/process_account_service.rb

@@ -90,8 +90,6 @@ class ActivityPub::ProcessAccountService < BaseService
     set_fetchable_attributes! unless @options[:only_key] || @account.suspended?
 
     @account.save_with_optional_media!
-
-    AccountsIndex.import! @account
   end
 
   def set_immediate_protocol_attributes!

app/services/activitypub/process_status_update_service.rb

@@ -54,8 +54,6 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
       broadcast_updates!
     end
 
-    StatusesIndex.import! @status
-
     forward_activity! if significant_changes? && @status_parser.edited_at > last_edit_date
   end
 

app/services/search_service.rb

@@ -35,14 +35,7 @@ class SearchService < BaseService
   end
 
   def perform_statuses_search!
-    statuses_index = StatusesIndex.filter(term: { searchable_by: @account.id })
+    definition = parsed_query.apply(StatusesIndex.filter(term: { searchable_by: @account.id }))
-    case Rails.configuration.x.search_scope
-    when :public
-      statuses_index = statuses_index.filter.or(term: { visibility: 'public' })
-    when :public_or_unlisted
-      statuses_index = statuses_index.filter.or(terms: { visibility: ['public', 'unlisted'] })
-    end
-    definition = parsed_query.apply(statuses_index)
 
     if @options[:account_id].present?
       definition = definition.filter(term: { account_id: @options[:account_id] })

config/initializers/search_scope.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-Rails.application.configure do
-  config.x.search_scope = case
-  when ENV['SEARCH_SCOPE'] == 'public'
-    :public
-  when ENV['SEARCH_SCOPE'] == 'public_or_unlisted'
-    :public_or_unlisted
-  else
-    :classic
-  end
-end