about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-12-18 11:24:44 +0100
committerThibG <thib@sitedethib.com>2018-12-20 14:51:12 +0100
commitbd23288a527bbbe0f8dcdf2a6ad3a585e4aed740 (patch)
tree0b40dfba4acd77911e91a685ff1290dd6e9f150a /app/controllers
parent9e04b2e8a4fa6cb45f59000faf2902a727973add (diff)
Add a per-user setting to hide followers count
This is only available if the instance-wide setting isn't set and allows
people to hide their own followers count. This does not hide others' to
them.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/follower_accounts_controller.rb2
-rw-r--r--app/controllers/settings/preferences_controller.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index 13043b1b9..f985f0eff 100644
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -37,7 +37,7 @@ class FollowerAccountsController < ApplicationController
 
   def collection_presenter
     options = { type: :ordered }
-    options[:size] = @account.followers_count unless Setting.hide_followers_count
+    options[:size] = @account.followers_count unless Setting.hide_followers_count || @account.user&.setting_hide_followers_count
     if params[:page].present?
       ActivityPub::CollectionPresenter.new(
         id: account_followers_url(@account, page: params.fetch(:page, 1)),
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index b70844b65..d4932afd6 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -43,6 +43,7 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_system_font_ui,
       :setting_noindex,
       :setting_hide_network,
+      :setting_hide_followers_count,
       :setting_aggregate_reblogs,
       notification_emails: %i(follow follow_request reblog favourite mention digest report),
       interactions: %i(must_be_follower must_be_following)