make hide stats option hide all public page stats

2 files changed, 35 insertions, 28 deletions

diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index d80310211..8efcba3e6 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -11,22 +11,24 @@
           %small
             = acct(account)
             = fa_icon('lock') if account.locked?
-      .public-account-header__tabs__tabs
-        .details-counters
-          .counter{ class: active_nav_class(short_account_url(account), short_account_with_replies_url(account), short_account_media_url(account)) }
-            = link_to short_account_url(account), class: 'u-url u-uid', title: number_with_delimiter(account.statuses_count) do
-              %span.counter-number= (number_to_human account.statuses_count, strip_insignificant_zeros: true) unless hide_stats?(account)
-              %span.counter-label= t('accounts.posts', count: account.statuses_count)
 
-          .counter{ class: active_nav_class(account_following_index_url(account)) }
-            = link_to account_following_index_url(account), title: hide_followers_count?(account) ? nil : number_with_delimiter(account.following_count) do
-              %span.counter-number= (number_to_human account.following_count, strip_insignificant_zeros: true) unless hide_stats?(account)
-              %span.counter-label= t('accounts.following', count: account.following_count)
+      - unless hide_stats?(account)
+        .public-account-header__tabs__tabs
+          .details-counters
+            .counter{ class: active_nav_class(short_account_url(account), short_account_with_replies_url(account), short_account_media_url(account)) }
+              = link_to short_account_url(account), class: 'u-url u-uid', title: number_with_delimiter(account.statuses_count) do
+                %span.counter-number= (number_to_human account.statuses_count, strip_insignificant_zeros: true)
+                %span.counter-label= t('accounts.posts', count: account.statuses_count)
 
-          .counter{ class: active_nav_class(account_followers_url(account)) }
-            = link_to account_followers_url(account), title: hide_followers_count?(account) ? nil : number_with_delimiter(account.followers_count) do
-              %span.counter-number= (number_to_human account.followers_count, strip_insignificant_zeros: true) unless hide_stats?(account) || hide_followers_count?(account)
-              %span.counter-label= t('accounts.followers', count: account.followers_count)
+            .counter{ class: active_nav_class(account_following_index_url(account)) }
+              = link_to account_following_index_url(account), title: hide_followers_count?(account) ? nil : number_with_delimiter(account.following_count) do
+                %span.counter-number= (number_to_human account.following_count, strip_insignificant_zeros: true) unless hide_followers_count?(account)
+                %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: hide_followers_count?(account) ? nil : number_with_delimiter(account.followers_count) do
+                %span.counter-number= (number_to_human account.followers_count, strip_insignificant_zeros: true) unless hide_followers_count?(account)
+                %span.counter-label= t('accounts.followers', count: account.followers_count)
         .spacer
         .public-account-header__tabs__tabs__buttons
           = account_action_button(account)
@@ -34,10 +36,11 @@
     .public-account-header__extra
       = render 'accounts/bio', account: account
 
-      .public-account-header__extra__links
-        = link_to account_following_index_url(account) do
-          %strong= (number_to_human account.following_count, strip_insignificant_zeros: true) unless hide_stats?(account)
-          = t('accounts.following', count: account.following_count)
-        = link_to account_followers_url(account) do
-          %strong= (number_to_human account.followers_count, strip_insignificant_zeros: true) unless hide_stats?(account) || hide_followers_count?(account)
-          = t('accounts.followers', count: account.followers_count)
+      - unless hide_stats?(account)
+        .public-account-header__extra__links
+          = link_to account_following_index_url(account) do
+            %strong= (number_to_human account.following_count, strip_insignificant_zeros: true)
+            = t('accounts.following', count: account.following_count)
+          = link_to account_followers_url(account) do
+            %strong= (number_to_human account.followers_count, strip_insignificant_zeros: true) unless hide_followers_count?(account)
+            = t('accounts.followers', count: account.followers_count)
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml
index 23f2920d8..0663b5c47 100644
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@ -55,23 +55,27 @@
         = fa_icon('reply-all')
       %span.detailed-status__reblogs>= number_to_human status.replies_count, strip_insignificant_zeros: true
       = " "
-    ·
     - if status.direct_visibility?
+      ·
       %span.detailed-status__link<
         = fa_icon('envelope')
     - elsif status.private_visibility? || status.limited_visibility?
+      ·
       %span.detailed-status__link<
         = fa_icon('lock')
-    - else
+    - elsif user_signed_in? && !@account.user&.setting_hide_stats
+      ·
       = link_to remote_interaction_path(status, type: :reblog), class: 'modal-button detailed-status__link' do
         = fa_icon('retweet')
         %span.detailed-status__reblogs>= number_to_human status.reblogs_count, strip_insignificant_zeros: true
         = " "
-    ·
-    = link_to remote_interaction_path(status, type: :favourite), class: 'modal-button detailed-status__link' do
-      = fa_icon('star')
-      %span.detailed-status__favorites>= number_to_human status.favourites_count, strip_insignificant_zeros: true
-      = " "
+
+    - if user_signed_in? && !@account.user&.setting_hide_stats
+      ·
+      = link_to remote_interaction_path(status, type: :favourite), class: 'modal-button detailed-status__link' do
+        = fa_icon('star')
+        %span.detailed-status__favorites>= number_to_human status.favourites_count, strip_insignificant_zeros: true
+        = " "
 
     - if user_signed_in?
       ·