From: ThibG <thib@sitedethib.com>
Date: Thu, 9 May 2019 20:03:44 +0000 (+0200)
Subject: Add some caching for HTML versions of statuses pages (#10701)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=26fc21c18844802652ff1f5910acaa91ebe19de4;p=mastodon.git

Add some caching for HTML versions of statuses pages (#10701)
---

diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index fc44d5fb1..e60646ba3 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -27,7 +27,10 @@ class StatusesController < ApplicationController
   def show
     respond_to do |format|
       format.html do
-        mark_cacheable! unless user_signed_in?
+        unless user_signed_in?
+          skip_session!
+          expires_in 10.seconds, public: true
+        end
 
         @body_classes = 'with-modals'
 
diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb
index 8568b151c..b75cefa74 100644
--- a/app/controllers/stream_entries_controller.rb
+++ b/app/controllers/stream_entries_controller.rb
@@ -15,6 +15,11 @@ class StreamEntriesController < ApplicationController
   def show
     respond_to do |format|
       format.html do
+        unless user_signed_in?
+          skip_session!
+          expires_in 5.minutes, public: true
+        end
+
         redirect_to short_account_status_url(params[:account_username], @stream_entry.activity) if @type == 'status'
       end