Move hide_followers_count logic to an helper

diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
index fce03d03eda1bf4c503684538d99a6bb4ea33cc6..46ef043432c29a4712be964220783f5d782a6f3e 100644 (file)
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -60,6 +60,10 @@ module StreamEntriesHelper
     end
   end
 
+  def hide_followers_count(account)
+    Setting.hide_followers_count || account.user&.setting_hide_followers_count
+  end
+
   def account_description(account)
     prepend_stats = [
       [
@@ -73,7 +77,7 @@ module StreamEntriesHelper
       ].join(' '),
     ]
 
-    unless Setting.hide_followers_count || account.user&.setting_hide_followers_count
+    unless hide_followers_count(account)
       prepend_stats << [
         number_to_human(account.followers_count, strip_insignificant_zeros: true),
         I18n.t('accounts.followers', count: account.followers_count),

diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index 87cb0a91f7a6415a3305bd04f51481f189df8574..a40ecb0d4ccdbcedbb8ac660f5a5d00b13131a8c 100644 (file)
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -24,8 +24,8 @@
               %span.counter-label= t('accounts.following', count: account.following_count)
 
           .counter{ class: active_nav_class(account_followers_url(account)) }
-            = link_to account_followers_url(account), title: (Setting.hide_followers_count || account.user&.setting_hide_followers_count) ? nil : number_with_delimiter(account.followers_count) do
-              %span.counter-number= (Setting.hide_followers_count || account.user&.setting_hide_followers_count) ? '-' : (number_to_human account.followers_count, strip_insignificant_zeros: true)
+            = link_to account_followers_url(account), title: hide_followers_count(account) ? nil : number_with_delimiter(account.followers_count) do
+              %span.counter-number= hide_followers_count(account) ? '-' : (number_to_human account.followers_count, strip_insignificant_zeros: true)
               %span.counter-label= t('accounts.followers', count: account.followers_count)
         .spacer
         .public-account-header__tabs__tabs__buttons

diff --git a/app/views/directories/index.html.haml b/app/views/directories/index.html.haml
index 0dc5e7d76f7a0907dbdd05ae8b514f96c08e1727..4189ce897acc0a24553d05f1375c6c66cd3a6b94 100644 (file)
--- a/app/views/directories/index.html.haml
+++ b/app/views/directories/index.html.haml
@@ -29,7 +29,7 @@
                   = number_to_human account.statuses_count, strip_insignificant_zeros: true
                   %small= t('accounts.posts', count: account.statuses_count).downcase
                 %td.accounts-table__count.optional
-                  = (Setting.hide_followers_count || account.user&.setting_hide_followers_count) ? '-' : (number_to_human account.followers_count, strip_insignificant_zeros: true)
+                  = hide_followers_count(account) ? '-' : (number_to_human account.followers_count, strip_insignificant_zeros: true)
                   %small= t('accounts.followers', count: account.followers_count).downcase
                 %td.accounts-table__count
                   - if account.last_status_at.present?