From: Thibaut Girka <thib@sitedethib.com>
Date: Sun, 8 Nov 2020 13:20:35 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0437d70628bcd852c303432562c74202554fe9cb;p=mastodon.git

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

Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Conflict due to upstream changing suspension logic while
  glitch-soc has an extra option to hide followers count.
  Ported upstream changes.
---

0437d70628bcd852c303432562c74202554fe9cb
diff --cc app/controllers/follower_accounts_controller.rb
index 5ffbdae79,ff4df2adf..18b281325
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@@ -53,17 -52,24 +53,25 @@@ class FollowerAccountsController < Appl
      account_followers_url(@account, page: page) unless page.nil?
    end
  
+   def next_page_url
+     page_url(follows.next_page) if follows.respond_to?(:next_page)
+   end
+ 
+   def prev_page_url
+     page_url(follows.prev_page) if follows.respond_to?(:prev_page)
+   end
+ 
    def collection_presenter
 +    options = { type: :ordered }
 +    options[:size] = @account.followers_count unless Setting.hide_followers_count || @account.user&.setting_hide_followers_count
      if page_requested?
        ActivityPub::CollectionPresenter.new(
          id: account_followers_url(@account, page: params.fetch(:page, 1)),
 -        type: :ordered,
 -        size: @account.followers_count,
          items: follows.map { |f| ActivityPub::TagManager.instance.uri_for(f.account) },
          part_of: account_followers_url(@account),
-         next: page_url(follows.next_page),
-         prev: page_url(follows.prev_page),
+         next: next_page_url,
 -        prev: prev_page_url
++        prev: prev_page_url,
 +        **options
        )
      else
        ActivityPub::CollectionPresenter.new(