From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 27 Nov 2018 17:49:37 +0000 (+0100)
Subject: Don't count suspended users in user count (#9380)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=81f96c973afab8b8357651dd55bc7b086d512935;p=mastodon.git

Don't count suspended users in user count (#9380)

Fix #7637
---

diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb
index 093c8ff32..dc77162d4 100644
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -18,7 +18,7 @@ class InstancePresenter
   end
 
   def user_count
-    Rails.cache.fetch('user_count') { User.confirmed.count }
+    Rails.cache.fetch('user_count') { User.confirmed.joins(:account).merge(Account.without_suspended).count }
   end
 
   def status_count