Change unconfirmed user login behaviour (#11375)

[mastodon.git] / app / controllers / about_controller.rb

diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index 04e7ddacf75595d6b197c0bc32388139890def64..31cf177105baf18cbc28da471b4d4c04e1ebc2fb 100644 (file)
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -1,20 +1,31 @@
 # frozen_string_literal: true
 
 class AboutController < ApplicationController
-  before_action :set_body_classes
-  before_action :set_instance_presenter, only: [:show, :more]
+  layout 'public'
+
+  before_action :set_body_classes, only: :show
+  before_action :set_instance_presenter
+  before_action :set_expires_in
+
+  skip_before_action :require_functional!, only: [:more, :terms]
 
   def show; end
 
-  def more; end
+  def more
+    flash.now[:notice] = I18n.t('about.instance_actor_flash') if params[:instance_actor]
+  end
 
   def terms; end
 
   private
 
   def new_user
-    User.new.tap(&:build_account)
+    User.new.tap do |user|
+      user.build_account
+      user.build_invite_request
+    end
   end
+
   helper_method :new_user
 
   def set_instance_presenter
@@ -22,6 +33,10 @@ class AboutController < ApplicationController
   end
 
   def set_body_classes
-    @body_classes = 'about-body'
+    @hide_navbar = true
+  end
+
+  def set_expires_in
+    expires_in 0, public: true
   end
 end