From faa336e3f7402b19c3417008b42cbef79c17db9c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 28 Apr 2023 10:27:26 +0200
Subject: [PATCH] Change logged-out WebUI HTML pages to be cached for a few
seconds (#24708)
---
app/controllers/about_controller.rb | 2 +-
app/controllers/accounts_controller.rb | 2 +-
app/controllers/follower_accounts_controller.rb | 2 +-
app/controllers/following_accounts_controller.rb | 2 +-
app/controllers/home_controller.rb | 2 +-
app/controllers/privacy_controller.rb | 2 +-
app/controllers/tags_controller.rb | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index 104348614..c4b7e9c9d 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -8,7 +8,7 @@ class AboutController < ApplicationController
before_action :set_instance_presenter
def show
- expires_in 0, public: true unless user_signed_in?
+ expires_in(15.seconds, public: true, stale_while_revalidate: 30.seconds, stale_if_error: 1.day) unless user_signed_in?
end
private
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 4034d014a..0090ef7ec 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -17,7 +17,7 @@ class AccountsController < ApplicationController
def show
respond_to do |format|
format.html do
- expires_in 0, public: true unless user_signed_in?
+ expires_in(15.seconds, public: true, stale_while_revalidate: 30.seconds, stale_if_error: 1.hour) unless user_signed_in?
@rss_url = rss_url
end
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index a260af7bd..f35af5903 100644
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -15,7 +15,7 @@ class FollowerAccountsController < ApplicationController
def index
respond_to do |format|
format.html do
- expires_in 0, public: true unless user_signed_in?
+ expires_in(15.seconds, public: true, stale_while_revalidate: 30.seconds, stale_if_error: 1.hour) unless user_signed_in?
end
format.json do
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
index dfdda64da..2aa31bdf0 100644
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -15,7 +15,7 @@ class FollowingAccountsController < ApplicationController
def index
respond_to do |format|
format.html do
- expires_in 0, public: true unless user_signed_in?
+ expires_in(15.seconds, public: true, stale_while_revalidate: 30.seconds, stale_if_error: 1.hour) unless user_signed_in?
end
format.json do
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index d8ee82a7a..ee940e670 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -6,7 +6,7 @@ class HomeController < ApplicationController
before_action :set_instance_presenter
def index
- expires_in 0, public: true unless user_signed_in?
+ expires_in(15.seconds, public: true, stale_while_revalidate: 30.seconds, stale_if_error: 1.day) unless user_signed_in?
end
private
diff --git a/app/controllers/privacy_controller.rb b/app/controllers/privacy_controller.rb
index 2c98bf3bf..070ee8a06 100644
--- a/app/controllers/privacy_controller.rb
+++ b/app/controllers/privacy_controller.rb
@@ -8,7 +8,7 @@ class PrivacyController < ApplicationController
before_action :set_instance_presenter
def show
- expires_in 0, public: true if current_account.nil?
+ expires_in(15.seconds, public: true, stale_while_revalidate: 30.seconds, stale_if_error: 1.day) unless user_signed_in?
end
private
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 3a1b30587..7e249dbea 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -21,7 +21,7 @@ class TagsController < ApplicationController
def show
respond_to do |format|
format.html do
- expires_in 0, public: true unless user_signed_in?
+ expires_in(15.seconds, public: true, stale_while_revalidate: 30.seconds, stale_if_error: 1.hour) unless user_signed_in?
end
format.rss do