1 files changed, 5 insertions, 10 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 01ef7c7ea..47d5f982e 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -347,18 +347,13 @@ class Status < ApplicationRecord
           .or(Status.where(account_id: mutual_account_ids, visibility: [:private, :local, :unlisted]))
           .or(Status.where(id: account.mentions.select(:status_id)))
       end
-      sql = 'tsv @@ plainto_tsquery(?)'
-      if term.start_with?('@@')
-        sql = 'tsv @@ to_tsquery(?)'
-        term = term[2..-1].lstrip
-      end
-      return none if term.blank?
-      pattern = sanitize_sql_like(term)
-      pattern = "#{pattern}"
-      query = query.without_reblogs.where(sql, pattern).offset(offset).limit(limit)
+      return none if term.blank? || term.length < 3
+      query = query.without_reblogs
+        .where('text ILIKE ?', "%#{sanitize_sql_like(term)}%")
+        .offset(offset).limit(limit)
       apply_timeline_filters(query, account, true)
     rescue ActiveRecord::StatementInvalid
-      raise Mastodon::ValidationError, 'Your advanced search query has invalid syntax.'
+      raise Mastodon::ValidationError, 'Invalid syntax.'
     end
 
     def selectable_visibilities