From 060112293bc5408b3128cf1d872e7dc4c2569117 Mon Sep 17 00:00:00 2001 From: evazion Date: Thu, 4 Oct 2018 13:03:18 -0500 Subject: [PATCH] /users: add more search params. --- app/models/user.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index b90ddffde..3984d8679 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -793,6 +793,14 @@ class User < ApplicationRecord params = params.dup params[:name_matches] = params.delete(:name) if params[:name].present? + q = q.search_text_attribute(:name, params) + q = q.attribute_matches(:level, params[:level]) + q = q.attribute_matches(:inviter_id, params[:inviter_id]) + q = q.attribute_matches(:post_upload_count, params[:post_upload_count]) + q = q.attribute_matches(:post_update_count, params[:post_update_count]) + q = q.attribute_matches(:note_update_count, params[:note_update_count]) + q = q.attribute_matches(:favorite_count, params[:favorite_count]) + if params[:name_matches].present? q = q.where_ilike(:name, normalize_name(params[:name_matches])) end @@ -809,10 +817,6 @@ class User < ApplicationRecord q = q.where("level <= ?", params[:max_level].to_i) end - if params[:level].present? - q = q.where("level = ?", params[:level].to_i) - end - bitprefs_length = BOOLEAN_ATTRIBUTES.length bitprefs_include = nil bitprefs_exclude = nil