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

Fix various rubocop issues.

Browse Source
This commit is contained in:
evazion
2020-01-11 19:01:40 -06:00
parent bab656a873
commit aff3d3b18f
15 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/logical/post_query_builder.rb
View File

@@ -40,9 +40,7 @@ class PostQueryBuilder
end
def escape_string_for_tsquery(array)
array.map do |token|
token.to_escaped_for_tsquery
end
array.map(&:to_escaped_for_tsquery)
end
def add_tag_string_search_relation(tags, relation)
@@ -314,7 +312,7 @@ class PostQueryBuilder
elsif flagger_id == "none"
relation = relation.where('NOT EXISTS (' + PostFlag.unscoped.search(:category => "normal").where('post_id = posts.id').reorder('').select('1').to_sql + ')')
elsif CurrentUser.can_view_flagger?(flagger_id)
post_ids = PostFlag.unscoped.search(:creator_id => flagger_id, :category => "normal").reorder("").select {|flag| flag.not_uploaded_by?(CurrentUser.id)}.map {|flag| flag.post_id}.uniq
post_ids = PostFlag.unscoped.search(creator_id: flagger_id, category: "normal").reorder("").select {|flag| flag.not_uploaded_by?(CurrentUser.id)}.map(&:post_id).uniq
relation = relation.where("posts.id": post_ids)
end
end