Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/accounts/_header.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/directories/index.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/helpers/accounts_helper.rb
index e977db2c6d9d307889d7d8bcd44a01e47465e7a8,db3da2b0507a3aeb60aeaff8e785808a535f7da8..bb2374c0efd3e664dd4de23879540c5592bd5b9a
--- 1/app/helpers/accounts_helper.rb
--- 2/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@@ -77,31 -77,25 +77,31 @@@ module AccountsHelpe
      end
    end
  
 +  def hide_followers_count?(account)
 +    Setting.hide_followers_count || account.user&.setting_hide_followers_count
 +  end
 +
    def account_description(account)
 -    prepend_str = [
 +    prepend_stats = [
        [
-         number_to_human(account.statuses_count, strip_insignificant_zeros: true),
+         number_to_human(account.statuses_count, precision: 3, strip_insignificant_zeros: true),
          I18n.t('accounts.posts', count: account.statuses_count),
        ].join(' '),
  
        [
-         number_to_human(account.following_count, strip_insignificant_zeros: true),
+         number_to_human(account.following_count, precision: 3, strip_insignificant_zeros: true),
          I18n.t('accounts.following', count: account.following_count),
        ].join(' '),
 +    ]
  
 -      [
 +    unless hide_followers_count?(account)
 +      prepend_stats << [
-         number_to_human(account.followers_count, strip_insignificant_zeros: true),
+         number_to_human(account.followers_count, precision: 3, strip_insignificant_zeros: true),
          I18n.t('accounts.followers', count: account.followers_count),
 -      ].join(' '),
 -    ].join(', ')
 +      ].join(' ')
 +    end
  
 -    [prepend_str, account.note].join(' · ')
 +    [prepend_stats.join(', '), account.note].join(' · ')
    end
  
    def svg_logo

diff --cc app/helpers/application_helper.rb
Simple merge

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc app/views/about/more.html.haml
Simple merge

diff --cc app/views/accounts/_header.html.haml
index 76dec18b124ab3551835b877843287f8c3876b8e,d9966723a742e49db5802d0ef05516f65d537494..d583edbd2d348bfbd6bf3481df43b853bdf63f6f
--- 1/app/views/accounts/_header.html.haml
--- 2/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@@ -24,8 -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: number_with_delimiter(account.followers_count) do
 -              %span.counter-number= friendly_number_to_human account.followers_count
 +            = 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-number= hide_followers_count?(account) ? '-' : (friendly_number_to_human account.followers_count)
                %span.counter-label= t('accounts.followers', count: account.followers_count)
          .spacer
          .public-account-header__tabs__tabs__buttons
@@@ -36,8 -36,8 +36,8 @@@
  
        .public-account-header__extra__links
          = link_to account_following_index_url(account) do
-           %strong= number_to_human account.following_count, strip_insignificant_zeros: true
+           %strong= friendly_number_to_human account.following_count
            = t('accounts.following', count: account.following_count)
          = link_to account_followers_url(account) do
-           %strong= hide_followers_count?(account) ? '-' : (number_to_human account.followers_count, strip_insignificant_zeros: true)
 -          %strong= friendly_number_to_human account.followers_count
++          %strong= hide_followers_count?(account) ? '-' : (friendly_number_to_human account.followers_count)
            = t('accounts.followers', count: account.followers_count)

diff --cc app/views/admin/dashboard/index.html.haml
Simple merge

diff --cc app/views/directories/index.html.haml
index febfb7d172fe0680d5b957fa39b0a7106d97c4ca,04639e32c228f373aa9d077068b96e2e0e8a43c5..d5509f9464e93afda192f559c87af2acc021ca93
--- 1/app/views/directories/index.html.haml
--- 2/app/views/directories/index.html.haml
+++ b/app/views/directories/index.html.haml
@@@ -39,10 -39,10 +39,10 @@@
  
          .directory__card__extra
            .accounts-table__count
-             = number_to_human account.statuses_count, strip_insignificant_zeros: true
+             = friendly_number_to_human account.statuses_count
              %small= t('accounts.posts', count: account.statuses_count).downcase
            .accounts-table__count
-             = hide_followers_count?(account) ? '-' : (number_to_human account.followers_count, strip_insignificant_zeros: true)
 -            = friendly_number_to_human account.followers_count
++            = hide_followers_count?(account) ? '-' : (friendly_number_to_human account.followers_count)
              %small= t('accounts.followers', count: account.followers_count).downcase
            .accounts-table__count
              - if account.last_status_at.present?

diff --cc config/routes.rb
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc package.json
index 4cb8829cdfc36f099bbfced061156f6c17fae4d3,517030f78685c53a98d40f05607d20a5729192b2..81abfa8bde336961430382574c835127698d0694
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -69,9 -68,8 +69,9 @@@
      "@babel/runtime": "^7.14.6",
      "@gamestdio/websocket": "^0.3.2",
      "@github/webauthn-json": "^0.5.7",
-     "@rails/ujs": "^6.1.3",
+     "@rails/ujs": "^6.1.4",
      "array-includes": "^3.1.3",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
      "autoprefixer": "^9.8.6",
      "axios": "^0.21.1",

diff --cc spec/models/tag_feed_spec.rb
Simple merge

diff --cc yarn.lock
Simple merge