Merge branch 'main' into glitch-soc/merge-upstream

2023-07-02 11:49:08 +02:00
parent 155fc459e3 ba06a2f104
commit 44e98a2740
32 changed files with 575 additions and 77 deletions
--- a/app/models/concerns/account_search.rb
+++ b/app/models/concerns/account_search.rb
@@ -106,6 +106,17 @@ module AccountSearch
    LIMIT :limit OFFSET :offset
  SQL

+  def searchable_text
+    PlainTextFormatter.new(note, local?).to_s if discoverable?
+  end
+
+  def searchable_properties
+    [].tap do |properties|
+      properties << 'bot' if bot?
+      properties << 'verified' if fields.any?(&:verified?)
+    end
+  end
+
  class_methods do
    def search_for(terms, limit: 10, offset: 0)
      tsquery = generate_query_for_search(terms)