treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Allow HTTP caching of json view of public statuses (#6115) 

* Allow HTTP caching of json view of public statuses

HTML views are not cached as they can contain private statuses as well

* Disable session cookies for ActivityPub json rendering of public toots
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
ThibG 2018-01-03 04:57:57 +01:00 committed by Eugen Rochko
parent 2471796d75
commit 99f962ba73
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/statuses_controller.rb
View File

@ -10,6 +10,7 @@ class StatusesController < ApplicationController
before_action :set_link_headers before_action :set_link_headers
before_action :check_account_suspension before_action :check_account_suspension
before_action :redirect_to_original, only: [:show] before_action :redirect_to_original, only: [:show]
before_action { response.headers['Vary'] = 'Accept' }
def show def show
respond_to do |format| respond_to do |format|
@ -25,6 +26,12 @@ class StatusesController < ApplicationController
serializer: ActivityPub::NoteSerializer, serializer: ActivityPub::NoteSerializer,
adapter: ActivityPub::Adapter, adapter: ActivityPub::Adapter,
content_type: 'application/activity+json' content_type: 'application/activity+json'
# Allow HTTP caching for 3 minutes if the status is public
unless @stream_entry.hidden?
request.session_options[:skip] = true
expires_in(3.minutes, public: true)
end
end end
end end
end end