jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

search: refactor to pass in the current user explicitly.

Browse Source
This commit is contained in:
evazion
2022-09-22 04:16:28 -05:00
parent b56b6c554b
commit 88ac91f5f3
82 changed files with 233 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/forum_post_vote.rb
View File

@@ -17,14 +17,14 @@ class ForumPostVote < ApplicationRecord
all
end
def self.forum_post_matches(params)
def self.forum_post_matches(params, current_user)
return all if params.blank?
where(forum_post_id: ForumPost.search(params).reorder(nil).select(:id))
where(forum_post_id: ForumPost.search(params, current_user).reorder(nil).select(:id))
end
def self.search(params)
q = search_attributes(params, :id, :created_at, :updated_at, :score, :creator, :forum_post)
q = q.forum_post_matches(params[:forum_post])
def self.search(params, current_user)
q = search_attributes(params, [:id, :created_at, :updated_at, :score, :creator, :forum_post], current_user: current_user)
q = q.forum_post_matches(params[:forum_post], current_user)
q.apply_default_order(params)
end