From 2d4d76472d4ab0d263d5d4669ade79f3235d49f1 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Tue, 22 Aug 2017 11:16:13 +0900
Subject: [PATCH] FIX: Broken suspect user lists.

https://meta.discourse.org/t/server-error-code-500/68404
---
 lib/admin_user_index_query.rb                  |  5 ++---
 spec/components/admin_user_index_query_spec.rb | 10 ++++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index 080b2135de2..f333f5619b9 100644
--- a/lib/admin_user_index_query.rb
+++ b/lib/admin_user_index_query.rb
@@ -4,8 +4,7 @@ class AdminUserIndexQuery
 
   def initialize(params = {}, klass = User, trust_levels = TrustLevel.levels)
     @params = params
-    @outer_query = initialize_query_with_order(klass)
-    @query = klass.joins(:user_emails).distinct
+    @query = initialize_query_with_order(klass.joins(:primary_email))
     @trust_levels = trust_levels
   end
 
@@ -135,7 +134,7 @@ class AdminUserIndexQuery
     append filter_by_ip
     append filter_exclude
     append filter_by_search
-    @outer_query.from(@query, 'users')
+    @query
   end
 
 end
diff --git a/spec/components/admin_user_index_query_spec.rb b/spec/components/admin_user_index_query_spec.rb
index 1c3fd90c08b..913e997d0c1 100644
--- a/spec/components/admin_user_index_query_spec.rb
+++ b/spec/components/admin_user_index_query_spec.rb
@@ -88,6 +88,16 @@ describe AdminUserIndexQuery do
 
   end
 
+  describe 'with a suspected user' do
+    let(:user) { Fabricate(:active_user, created_at: 1.day.ago) }
+
+    it 'finds the suspected user' do
+      user
+      query = AdminUserIndexQuery.new(query: 'suspect')
+      expect(query.find_users).to eq([user])
+    end
+  end
+
   describe "with a pending user" do
 
     let!(:user) { Fabricate(:user, approved: false) }