Revert "Add new publicly_searchable attribute to status index (#6)"

This reverts commit 4bc96aa.
jsgoldstein · Jul 27, 2023 · f9e674d · f9e674d
1 parent 34a26ce
commit f9e674d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 29 deletions.
diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb
@@ -63,14 +63,13 @@ class StatusesIndex < Chewy::Index
   end
 
   root date_detection: false do
-    field(:id, type: 'long')
-    field(:account_id, type: 'long')
+    field :id, type: 'long'
+    field :account_id, type: 'long'
 
-    field(:text, type: 'text', value: ->(status) { status.searchable_text }) do
-      field(:stemmed, type: 'text', analyzer: 'content')
+    field :text, type: 'text', value: ->(status) { status.searchable_text } do
+      field :stemmed, type: 'text', analyzer: 'content'
     end
 
-    field(:searchable_by, type: 'long', value: ->(status, crutches) { status.searchable_by(crutches) })
-    field(:publicly_searchable, type: 'boolean', value: ->(status) { status.publicly_searchable? })
+    field :searchable_by, type: 'long', value: ->(status, crutches) { status.searchable_by(crutches) }
   end
 end
diff --git a/app/models/account.rb b/app/models/account.rb
@@ -79,7 +79,6 @@ class Account < ApplicationRecord
   include DomainMaterializable
   include AccountMerging
   include AccountSearch
-  include AccountStatusesSearch
 
   enum protocol: { ostatus: 0, activitypub: 1 }
   enum suspension_origin: { local: 0, remote: 1 }, _prefix: true
@@ -132,7 +131,6 @@ class Account < ApplicationRecord
   scope :not_domain_blocked_by_account, ->(account) { where(arel_table[:domain].eq(nil).or(arel_table[:domain].not_in(account.excluded_from_timeline_domains))) }
 
   after_update_commit :trigger_update_webhooks
-  after_update :update_statuses_index!, if: :saved_change_to_discoverable? and Chewy.enabled?
 
   delegate :email,
            :unconfirmed_email,

diff --git a/app/models/concerns/account_statuses_search.rb b/app/models/concerns/account_statuses_search.rb
diff --git a/app/models/concerns/status_search.rb b/app/models/concerns/status_search.rb
diff --git a/app/models/status.rb b/app/models/status.rb
@@ -37,7 +37,6 @@ class Status < ApplicationRecord
   include StatusSnapshotConcern
   include RateLimitable
   include StatusSafeReblogInsert
-  include StatusSearch
 
   rate_limit by: :account, family: :statuses