Merge tag 'v2.7.0rc1' into instance_only_statuses

app/controllers/settings/applications_controller.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-class Settings::ApplicationsController < ApplicationController
+class Settings::ApplicationsController < Settings::BaseController
   layout 'admin'
 
   before_action :authenticate_user!
   before_action :set_application, only: [:show, :update, :destroy, :regenerate]
   before_action :prepare_scopes, only: [:create, :update]
-  before_action :set_body_classes
 
   def index
     @applications = current_user.applications.order(id: :desc).page(params[:page])
@@ -70,8 +69,4 @@ class Settings::ApplicationsController < ApplicationController
     scopes = params.fetch(:doorkeeper_application, {}).fetch(:scopes, nil)
     params[:doorkeeper_application][:scopes] = scopes.join(' ') if scopes.is_a? Array
   end
-
-  def set_body_classes
-    @body_classes = 'admin'
-  end
 end

app/controllers/settings/base_controller.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Settings::BaseController < ApplicationController
+  before_action :set_body_classes
+
+  private
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
+end

app/controllers/settings/deletes_controller.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-class Settings::DeletesController < ApplicationController
+class Settings::DeletesController < Settings::BaseController
   layout 'admin'
 
   before_action :check_enabled_deletion
   before_action :authenticate_user!
-  before_action :set_body_classes
 
   def show
     @confirmation = Form::DeleteConfirmation.new
@@ -30,8 +29,4 @@ class Settings::DeletesController < ApplicationController
   def delete_params
     params.require(:form_delete_confirmation).permit(:password)
   end
-
-  def set_body_classes
-    @body_classes = 'admin'
-  end
 end

app/controllers/settings/exports/blocked_domains_controller.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Settings
+  module Exports
+    class BlockedDomainsController < ApplicationController
+      include ExportControllerConcern
+
+      def index
+        send_export_file
+      end
+
+      private
+
+      def export_data
+        @export.to_blocked_domains_csv
+      end
+    end
+  end
+end

app/controllers/settings/exports/lists_controller.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Settings
+  module Exports
+    class ListsController < ApplicationController
+      include ExportControllerConcern
+
+      def index
+        send_export_file
+      end
+
+      private
+
+      def export_data
+        @export.to_lists_csv
+      end
+    end
+  end
+end

app/controllers/settings/exports_controller.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-class Settings::ExportsController < ApplicationController
+class Settings::ExportsController < Settings::BaseController
   include Authorization
 
   layout 'admin'
 
   before_action :authenticate_user!
-  before_action :set_body_classes
 
   def show
     @export  = Export.new(current_account)
@@ -21,10 +20,4 @@ class Settings::ExportsController < ApplicationController
 
     redirect_to settings_export_path
   end
-
-  private
-
-  def set_body_classes
-    @body_classes = 'admin'
-  end
 end

app/controllers/settings/follower_domains_controller.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-class Settings::FollowerDomainsController < ApplicationController
+class Settings::FollowerDomainsController < Settings::BaseController
   layout 'admin'
 
   before_action :authenticate_user!
-  before_action :set_body_classes
 
   def show
     @account = current_account
@@ -26,8 +25,4 @@ class Settings::FollowerDomainsController < ApplicationController
   def bulk_params
     params.permit(select: [])
   end
-
-  def set_body_classes
-    @body_classes = 'admin'
-  end
 end

app/controllers/settings/imports_controller.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-class Settings::ImportsController < ApplicationController
+class Settings::ImportsController < Settings::BaseController
   layout 'admin'
 
   before_action :authenticate_user!
   before_action :set_account
-  before_action :set_body_classes
 
   def show
     @import = Import.new
@@ -32,8 +31,4 @@ class Settings::ImportsController < ApplicationController
   def import_params
     params.require(:import).permit(:data, :type)
   end
-
-  def set_body_classes
-    @body_classes = 'admin'
-  end
 end

app/controllers/settings/migrations_controller.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-class Settings::MigrationsController < ApplicationController
+class Settings::MigrationsController < Settings::BaseController
   layout 'admin'
 
   before_action :authenticate_user!
-  before_action :set_body_classes
 
   def show
     @migration = Form::Migration.new(account: current_account.moved_to_account)
@@ -32,8 +31,4 @@ class Settings::MigrationsController < ApplicationController
     current_account.moved_to_account_id != @migration.account&.id &&
       current_account.id != @migration.account&.id
   end
-
-  def set_body_classes
-    @body_classes = 'admin'
-  end
 end

app/controllers/settings/notifications_controller.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-class Settings::NotificationsController < ApplicationController
+class Settings::NotificationsController < Settings::BaseController
   layout 'admin'
 
   before_action :authenticate_user!
-  before_action :set_body_classes
 
   def show; end
 
@@ -30,8 +29,4 @@ class Settings::NotificationsController < ApplicationController
       interactions: %i(must_be_follower must_be_following must_be_following_dm)
     )
   end
-
-  def set_body_classes
-    @body_classes = 'admin'
-  end
 end

app/controllers/settings/preferences_controller.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-class Settings::PreferencesController < ApplicationController
+class Settings::PreferencesController < Settings::BaseController
   layout 'admin'
 
   before_action :authenticate_user!
-  before_action :set_body_classes
 
   def show; end
 
@@ -49,12 +48,9 @@ class Settings::PreferencesController < ApplicationController
       :setting_noindex,
       :setting_theme,
       :setting_hide_network,
+      :setting_aggregate_reblogs,
       notification_emails: %i(follow follow_request reblog favourite mention digest report),
       interactions: %i(must_be_follower must_be_following)
     )
   end
-
-  def set_body_classes
-    @body_classes = 'admin'
-  end
 end

app/controllers/settings/profiles_controller.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-class Settings::ProfilesController < ApplicationController
+class Settings::ProfilesController < Settings::BaseController
   include ObfuscateFilename
 
   layout 'admin'
 
   before_action :authenticate_user!
   before_action :set_account
-  before_action :set_body_classes
 
   obfuscate_filename [:account, :avatar]
   obfuscate_filename [:account, :header]
@@ -29,14 +28,10 @@ class Settings::ProfilesController < ApplicationController
   private
 
   def account_params
-    params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, :bot, fields_attributes: [:name, :value])
+    params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, :bot, :discoverable, fields_attributes: [:name, :value])
   end
 
   def set_account
     @account = current_user.account
   end
-
-  def set_body_classes
-    @body_classes = 'admin'
-  end
 end

app/controllers/settings/sessions_controller.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-class Settings::SessionsController < ApplicationController
+class Settings::SessionsController < Settings::BaseController
   before_action :set_session, only: :destroy
-  before_action :set_body_classes
 
   def destroy
     @session.destroy!
@@ -15,8 +14,4 @@ class Settings::SessionsController < ApplicationController
   def set_session
     @session = current_user.session_activations.find(params[:id])
   end
-
-  def set_body_classes
-    @body_classes = 'admin'
-  end
 end

app/controllers/settings/two_factor_authentication/confirmations_controller.rb

@@ -2,12 +2,11 @@
 
 module Settings
   module TwoFactorAuthentication
-    class ConfirmationsController < ApplicationController
+    class ConfirmationsController < BaseController
       layout 'admin'
 
       before_action :authenticate_user!
       before_action :ensure_otp_secret
-      before_action :set_body_classes
 
       def new
         prepare_two_factor_form
@@ -44,10 +43,6 @@ module Settings
       def ensure_otp_secret
         redirect_to settings_two_factor_authentication_path unless current_user.otp_secret
       end
-
-      def set_body_classes
-        @body_classes = 'admin'
-      end
     end
   end
 end

app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb

@@ -2,11 +2,10 @@
 
 module Settings
   module TwoFactorAuthentication
-    class RecoveryCodesController < ApplicationController
+    class RecoveryCodesController < BaseController
       layout 'admin'
 
       before_action :authenticate_user!
-      before_action :set_body_classes
 
       def create
         @recovery_codes = current_user.generate_otp_backup_codes!
@@ -14,12 +13,6 @@ module Settings
         flash[:notice] = I18n.t('two_factor_authentication.recovery_codes_regenerated')
         render :index
       end
-
-      private
-
-      def set_body_classes
-        @body_classes = 'admin'
-      end
     end
   end
 end

app/controllers/settings/two_factor_authentications_controller.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
 module Settings
-  class TwoFactorAuthenticationsController < ApplicationController
+  class TwoFactorAuthenticationsController < BaseController
     layout 'admin'
 
     before_action :authenticate_user!
     before_action :verify_otp_required, only: [:create]
-    before_action :set_body_classes
 
     def show
       @confirmation = Form::TwoFactorConfirmation.new
@@ -44,9 +43,5 @@ module Settings
       current_user.validate_and_consume_otp!(confirmation_params[:code]) ||
         current_user.invalidate_otp_backup_code!(confirmation_params[:code])
     end
-
-    def set_body_classes
-      @body_classes = 'admin'
-    end
   end
 end