Merge pull request #2906 from techAPJ/patch-3

Moderators can search users by ip address

config/locales/client.en.yml

@@ -576,7 +576,7 @@ en:
     created: 'Created'
     created_lowercase: 'created'
     trust_level: 'Trust Level'
-    search_hint: 'username'
+    search_hint: 'username or IP address'
     search_hint_admin: 'username, email or IP address'
 
     create_account:

lib/admin_user_index_query.rb

@@ -42,11 +42,15 @@ class AdminUserIndexQuery
         else
           @query.where('username_lower ILIKE :filter OR email ILIKE :filter', filter: "%#{params[:filter]}%")
         end
+      else
+        if params[:filter] =~ Resolv::IPv4::Regex || params[:filter] =~ Resolv::IPv6::Regex
+          @query.where('ip_address = :ip OR registration_ip_address = :ip', ip: params[:filter])
         else
           @query.where('username_lower ILIKE :filter', filter: "%#{params[:filter]}%")
         end
       end
     end
+  end
 
   def filter_by_ip
     if params[:ip].present?

spec/components/admin_user_index_query_spec.rb

@@ -140,19 +140,10 @@ describe AdminUserIndexQuery do
     context "by ip address fragment" do
       before(:each) { Fabricate(:user, ip_address: "117.207.94.9") }
 
-      context "when authenticated as a non-admin user" do
-        it "doesn't match the ip address" do
-          query = ::AdminUserIndexQuery.new({ filter: "117.207.94.9" })
-          expect(query.find_users.count()).to eq(0)
-        end
-      end
-
-      context "when authenticated as an admin user" do
       it "matches the ip address" do
-          query = ::AdminUserIndexQuery.new({ filter: "117.207.94.9", admin: true })
+        query = ::AdminUserIndexQuery.new({ filter: "117.207.94.9" })
         expect(query.find_users.count()).to eq(1)
       end
-      end
 
     end