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

Model#search: factor out post_tags_match.

Browse Source
This commit is contained in:
evazion
2019-08-29 16:44:19 -05:00
parent c3ad7f6112
commit 6fc4b63fa8
9 changed files with 27 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/artist_commentary.rb
View File

@@ -18,10 +18,6 @@ class ArtistCommentary < ApplicationRecord
where("original_title ILIKE ? ESCAPE E'\\\\' OR original_description ILIKE ? ESCAPE E'\\\\' OR translated_title ILIKE ? ESCAPE E'\\\\' OR translated_description ILIKE ? ESCAPE E'\\\\'", escaped_query, escaped_query, escaped_query, escaped_query)
end
def post_tags_match(query)
where(post_id: PostQueryBuilder.new(query).build.reorder(""))
end
def deleted
where(original_title: "", original_description: "", translated_title: "", translated_description: "")
end
@@ -33,14 +29,12 @@ class ArtistCommentary < ApplicationRecord
def search(params)
q = super
q = q.search_post_id_attribute(params)
if params[:text_matches].present?
q = q.text_matches(params[:text_matches])
end
if params[:post_id].present?
q = q.where(post_id: params[:post_id].split(",").map(&:to_i))
end
if params[:original_present].to_s.truthy?
q = q.where("(original_title != '') or (original_description != '')")
elsif params[:original_present].to_s.falsy?
@@ -53,10 +47,6 @@ class ArtistCommentary < ApplicationRecord
q = q.where("(translated_title = '') and (translated_description = '')")
end
if params[:post_tags_match].present?
q = q.post_tags_match(params[:post_tags_match])
end
q = q.deleted if params[:is_deleted] == "yes"
q = q.undeleted if params[:is_deleted] == "no"