Allow import/export of mutes list (#1541)

* Allow export of mutes list

* Allow importing of mutes list

* Refactor to use Settings::Exports::BaseController and DRY up exports code
This commit is contained in:
Matt Jankowski
2017-04-12 12:20:44 -04:00
committed by Eugen
parent 08fce08217
commit 7f0a865b05
13 changed files with 86 additions and 19 deletions

View File

@ -0,0 +1,23 @@
# frozen_string_literal: true
module Settings
module Exports
class BaseController < ApplicationController
before_action :authenticate_user!
def index
export_data = Export.new(export_accounts).to_csv
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

View File

@ -2,15 +2,11 @@
module Settings
module Exports
class BlockedAccountsController < ApplicationController
before_action :authenticate_user!
class BlockedAccountsController < BaseController
private
def index
export_data = Export.new(current_account.blocking).to_csv
respond_to do |format|
format.csv { send_data export_data, filename: 'blocking.csv' }
end
def export_accounts
current_account.blocking
end
end
end

View File

@ -2,15 +2,11 @@
module Settings
module Exports
class FollowingAccountsController < ApplicationController
before_action :authenticate_user!
class FollowingAccountsController < BaseController
private
def index
export_data = Export.new(current_account.following).to_csv
respond_to do |format|
format.csv { send_data export_data, filename: 'following.csv' }
end
def export_accounts
current_account.following
end
end
end

View File

@ -0,0 +1,13 @@
# frozen_string_literal: true
module Settings
module Exports
class MutedAccountsController < BaseController
private
def export_accounts
current_account.muting
end
end
end
end

View File

@ -9,5 +9,6 @@ class Settings::ExportsController < ApplicationController
@total_storage = current_account.media_attachments.sum(:file_file_size)
@total_follows = current_account.following.count
@total_blocks = current_account.blocking.count
@total_mutes = current_account.muting.count
end
end

View File

@ -3,7 +3,7 @@
class Import < ApplicationRecord
self.inheritance_column = false
enum type: [:following, :blocking]
enum type: [:following, :blocking, :muting]
belongs_to :account

View File

@ -15,3 +15,7 @@
%th= t('exports.blocks')
%td= @total_blocks
%td= table_link_to 'download', t('exports.csv'), settings_exports_blocks_path(format: :csv)
%tr
%th= t('exports.mutes')
%td= @total_mutes
%td= table_link_to 'download', t('exports.csv'), settings_exports_mutes_path(format: :csv)

View File

@ -16,6 +16,8 @@ class ImportWorker
process_blocks
when 'following'
process_follows
when 'muting'
process_mutes
end
@import.destroy
@ -35,6 +37,18 @@ class ImportWorker
CSV.new(import_contents).reject(&:blank?)
end
def process_mutes
import_rows.each do |row|
begin
target_account = FollowRemoteAccountService.new.call(row.first)
next if target_account.nil?
MuteService.new.call(from_account, target_account)
rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
next
end
end
end
def process_blocks
import_rows.each do |row|
begin