marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

`Status.search_for`: Don't need `Status.unscoped`; the `default_scope` sorts the way we intend.

staging
multiple creatures 2019-04-13 23:32:41 -05:00
parent dd5e02ad5d
commit 16147d73a2
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/models/status.rb
View File

@ -301,18 +301,16 @@ class Status < ApplicationRecord
def search_for(term, limit = 33, account = nil)
pattern = sanitize_sql_like(term)
pattern = "#{pattern}"
Status.unscoped {
scope = Status.where("tsv @@ plainto_tsquery('english', ?)", pattern)
query = scope.where(visibility: :public)
if account.present?
query = query
.or(scope.where(account: account))
.or(scope.where(account: account.following, visibility: [:unlisted, :private]))
.or(scope.where(id: account.mentions.select(:status_id)))
end
query = query.where(reblog_of_id: nil).order(id: :desc).limit(limit)
apply_timeline_filters(query, account, true)
}
scope = Status.where("tsv @@ plainto_tsquery('english', ?)", pattern)
query = scope.where(visibility: :public)
if account.present?
query = query
.or(scope.where(account: account))
.or(scope.where(account: account.following, visibility: [:unlisted, :private]))
.or(scope.where(id: account.mentions.select(:status_id)))
end
query = query.where(reblog_of_id: nil).limit(limit)
apply_timeline_filters(query, account, true)
end
def selectable_visibilities