summaryrefslogtreecommitdiffstats
path: root/app/controllers/settings
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/settings')
-rw-r--r--app/controllers/settings/exports/base_controller.rb23
-rw-r--r--app/controllers/settings/exports/blocked_accounts_controller.rb8
-rw-r--r--app/controllers/settings/exports/following_accounts_controller.rb8
-rw-r--r--app/controllers/settings/exports/muted_accounts_controller.rb8
4 files changed, 21 insertions, 26 deletions
diff --git a/app/controllers/settings/exports/base_controller.rb b/app/controllers/settings/exports/base_controller.rb
deleted file mode 100644
index c082ed806c4..00000000000
--- a/app/controllers/settings/exports/base_controller.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Settings
- module Exports
- class BaseController < ApplicationController
- before_action :authenticate_user!
-
- def index
- @export = Export.new(current_account)
-
- respond_to do |format|
- format.csv { send_data export_data, filename: export_filename }
- end
- end
-
- private
-
- def export_filename
- "#{controller_name}.csv"
- end
- end
- end
-end
diff --git a/app/controllers/settings/exports/blocked_accounts_controller.rb b/app/controllers/settings/exports/blocked_accounts_controller.rb
index f1115b21e31..2092104e01d 100644
--- a/app/controllers/settings/exports/blocked_accounts_controller.rb
+++ b/app/controllers/settings/exports/blocked_accounts_controller.rb
@@ -2,7 +2,13 @@
module Settings
module Exports
- class BlockedAccountsController < BaseController
+ class BlockedAccountsController < ApplicationController
+ include ExportControllerConcern
+
+ def index
+ send_export_file
+ end
+
private
def export_data
diff --git a/app/controllers/settings/exports/following_accounts_controller.rb b/app/controllers/settings/exports/following_accounts_controller.rb
index 0011d2463a1..74281ddca26 100644
--- a/app/controllers/settings/exports/following_accounts_controller.rb
+++ b/app/controllers/settings/exports/following_accounts_controller.rb
@@ -2,7 +2,13 @@
module Settings
module Exports
- class FollowingAccountsController < BaseController
+ class FollowingAccountsController < ApplicationController
+ include ExportControllerConcern
+
+ def index
+ send_export_file
+ end
+
private
def export_data
diff --git a/app/controllers/settings/exports/muted_accounts_controller.rb b/app/controllers/settings/exports/muted_accounts_controller.rb
index dfe72cfcb9e..e511619ca6a 100644
--- a/app/controllers/settings/exports/muted_accounts_controller.rb
+++ b/app/controllers/settings/exports/muted_accounts_controller.rb
@@ -2,7 +2,13 @@
module Settings
module Exports
- class MutedAccountsController < BaseController
+ class MutedAccountsController < ApplicationController
+ include ExportControllerConcern
+
+ def index
+ send_export_file
+ end
+
private
def export_data