diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-04-04 14:53:52 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-04 14:53:52 +0200 |
commit | 1682ac571763f473da54074b0608cd9ccb4b9ae5 (patch) | |
tree | 2cb3f134660b2d7d460772966f7eb595395611f7 /app/controllers/follower_accounts_controller.rb | |
parent | 3f5acc1ab3bc9c5a6c5805901a393ccd3457b909 (diff) | |
parent | 26bd9fa508ac155f996c2c0d9753a27d46158749 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/following_accounts_controller.rb Conflicts were due to glitch-soc's theming system. - app/javascript/packs/public.js Some code has been change upstream, but it has been moved to app/javascript/core/settings.js in glitch-soc. Applied the changes there.
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, |