diff options
author | ThibG <thib@sitedethib.com> | 2019-04-04 15:13:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-04 15:13:18 +0200 |
commit | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (patch) | |
tree | e6022023d42dde628bb44880659104a87f985039 /app/controllers/following_accounts_controller.rb | |
parent | 14bad3f472b2d9887db701409db93e511e9c6f50 (diff) | |
parent | be6885eb93c088699465d1c50e49e8ba6d9fa3a7 (diff) |
Merge pull request #981 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/following_accounts_controller.rb')
-rw-r--r-- | app/controllers/following_accounts_controller.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb index 098b2a20c..181f85221 100644 --- a/app/controllers/following_accounts_controller.rb +++ b/app/controllers/following_accounts_controller.rb @@ -3,10 +3,13 @@ class FollowingAccountsController < ApplicationController include AccountControllerConcern + before_action :set_cache_headers + def index respond_to do |format| format.html do use_pack 'public' + mark_cacheable! unless user_signed_in? next if @account.user_hides_network? @@ -17,6 +20,11 @@ class FollowingAccountsController < 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, |