diff options
author | Reverite <github@reverite.sh> | 2019-04-12 01:38:18 -0700 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-04-12 01:38:18 -0700 |
commit | e10a9794f4ed7c90e3190f285359f55dd00da435 (patch) | |
tree | 579ebf95d6bbf091d05e66907a9c8168c926e0af /app/controllers/follower_accounts_controller.rb | |
parent | ff736905fa534f7189e57c1d0c14fbac45f239a1 (diff) | |
parent | bb50ec2e6687238ad8b2ec545a73270fee7a7b09 (diff) |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/follower_accounts_controller.rb')
-rw-r--r-- | app/controllers/follower_accounts_controller.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb index 213c209ab..1462b94fc 100644 --- a/app/controllers/follower_accounts_controller.rb +++ b/app/controllers/follower_accounts_controller.rb @@ -3,6 +3,8 @@ class FollowerAccountsController < ApplicationController include AccountControllerConcern + before_action :set_cache_headers + def index respond_to do |format| format.html do @@ -18,6 +20,11 @@ class FollowerAccountsController < ApplicationController format.json do raise Mastodon::NotPermittedError if params[:page].present? && @account.user_hides_network? + if params[:page].blank? + skip_session! + expires_in 3.minutes, public: true + end + render json: collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, |