Merge pull request #1729 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 9 insertions, 0 deletions

diff --git a/app/models/status.rb b/app/models/status.rb
index 62f9e5831..9eaf85668 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -160,6 +160,15 @@ class Status < ApplicationRecord
     ids.uniq
   end
 
+  def searchable_text
+    [
+      spoiler_text,
+      FormattingHelper.extract_status_plain_text(self),
+      preloadable_poll ? preloadable_poll.options.join("\n\n") : nil,
+      ordered_media_attachments.map(&:description).join("\n\n"),
+    ].compact.join("\n\n")
+  end
+
   def reply?
     !in_reply_to_id.nil? || attributes['reply']
   end