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 810f212fd2a71a31bec5c1bb119152787da1a98b..31cf177105baf18cbc28da471b4d4c04e1ebc2fb 100644 (file)
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -1,22 +1,29 @@
 # frozen_string_literal: true
 
 class AboutController < ApplicationController
-  before_action :set_body_classes
-  before_action :set_instance_presenter, only: [:show, :more, :terms]
+  layout 'public'
 
-  def show
-    serializable_resource = ActiveModelSerializers::SerializableResource.new(InitialStatePresenter.new(initial_state_params), serializer: InitialStateSerializer)
-    @initial_state_json   = serializable_resource.to_json
-  end
+  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 more; end
+  def show; 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
@@ -26,13 +33,10 @@ class AboutController < ApplicationController
   end
 
   def set_body_classes
-    @body_classes = 'with-modals'
+    @hide_navbar = true
   end
 
-  def initial_state_params
-    {
-      settings: { known_fediverse: Setting.show_known_fediverse_at_about_page },
-      token: current_session&.token,
-    }
+  def set_expires_in
+    expires_in 0, public: true
   end
 end