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 093c8ff3298f7680e2f4187c57abd39bf95718a9..dc77162d441aa3ee8e8f641cc5dacc6e3240a4f1 100644 (file)
--- 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