Merge branch 'main' into glitch-soc/merge-upstream

1 files changed, 5 insertions, 14 deletions

diff --git a/app/controllers/privacy_controller.rb b/app/controllers/privacy_controller.rb
index 126bb0128..2c98bf3bf 100644
--- a/app/controllers/privacy_controller.rb
+++ b/app/controllers/privacy_controller.rb
@@ -1,28 +1,19 @@
 # frozen_string_literal: true
 
 class PrivacyController < ApplicationController
-  layout 'public'
+  include WebAppControllerConcern
 
-  before_action :set_pack
+  skip_before_action :require_functional!
 
   before_action :set_instance_presenter
-  before_action :set_expires_in
-
-  skip_before_action :require_functional!
 
-  def show; end
+  def show
+    expires_in 0, public: true if current_account.nil?
+  end
 
   private
 
-  def set_pack
-    use_pack 'public'
-  end
-
   def set_instance_presenter
     @instance_presenter = InstancePresenter.new
   end
-
-  def set_expires_in
-    expires_in 0, public: true
-  end
 end