Add CSV export for lists and domain blocks (#9677)

Fix #6893
Fix #9268
This commit is contained in:
Eugen Rochko 2019-01-01 13:44:04 +01:00 committed by GitHub
parent 1d4215be77
commit 7fc7437d05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 82 additions and 4 deletions

View file

@ -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

View file

@ -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

View file

@ -9,15 +9,33 @@ class Export
end end
def to_blocked_accounts_csv def to_blocked_accounts_csv
to_csv account.blocking to_csv account.blocking.select(:username, :domain)
end end
def to_muted_accounts_csv def to_muted_accounts_csv
to_csv account.muting to_csv account.muting.select(:username, :domain)
end end
def to_following_accounts_csv def to_following_accounts_csv
to_csv account.following to_csv account.following.select(:username, :domain)
end
def to_lists_csv
CSV.generate do |csv|
account.owned_lists.select(:title).each do |list|
list.accounts.select(:username, :domain).each do |account|
csv << [list.title, acct(account)]
end
end
end
end
def to_blocked_domains_csv
CSV.generate do |csv|
account.domain_blocks.pluck(:domain).each do |domain|
csv << [domain]
end
end
end end
def total_storage def total_storage
@ -32,6 +50,10 @@ class Export
account.following_count account.following_count
end end
def total_lists
account.owned_lists.count
end
def total_followers def total_followers
account.followers_count account.followers_count
end end
@ -44,13 +66,21 @@ class Export
account.muting.count account.muting.count
end end
def total_domain_blocks
account.domain_blocks.count
end
private private
def to_csv(accounts) def to_csv(accounts)
CSV.generate do |csv| CSV.generate do |csv|
accounts.each do |account| accounts.each do |account|
csv << [(account.local? ? account.local_username_and_domain : account.acct)] csv << [acct(account)]
end end
end end
end end
def acct(account)
account.local? ? account.local_username_and_domain : account.acct
end
end end

View file

@ -16,6 +16,10 @@
%th= t('exports.follows') %th= t('exports.follows')
%td= number_with_delimiter @export.total_follows %td= number_with_delimiter @export.total_follows
%td= table_link_to 'download', t('exports.csv'), settings_exports_follows_path(format: :csv) %td= table_link_to 'download', t('exports.csv'), settings_exports_follows_path(format: :csv)
%tr
%th= t('exports.lists')
%td= number_with_delimiter @export.total_lists
%td= table_link_to 'download', t('exports.csv'), settings_exports_lists_path(format: :csv)
%tr %tr
%th= t('accounts.followers', count: @export.total_followers) %th= t('accounts.followers', count: @export.total_followers)
%td= number_with_delimiter @export.total_followers %td= number_with_delimiter @export.total_followers
@ -28,6 +32,10 @@
%th= t('exports.mutes') %th= t('exports.mutes')
%td= number_with_delimiter @export.total_mutes %td= number_with_delimiter @export.total_mutes
%td= table_link_to 'download', t('exports.csv'), settings_exports_mutes_path(format: :csv) %td= table_link_to 'download', t('exports.csv'), settings_exports_mutes_path(format: :csv)
%tr
%th= t('exports.domain_blocks')
%td= number_with_delimiter @export.total_domain_blocks
%td= table_link_to 'download', t('exports.csv'), settings_exports_domain_blocks_path(format: :csv)
%p.muted-hint= t('exports.archive_takeout.hint_html') %p.muted-hint= t('exports.archive_takeout.hint_html')

View file

@ -94,6 +94,8 @@ Rails.application.routes.draw do
resources :follows, only: :index, controller: :following_accounts resources :follows, only: :index, controller: :following_accounts
resources :blocks, only: :index, controller: :blocked_accounts resources :blocks, only: :index, controller: :blocked_accounts
resources :mutes, only: :index, controller: :muted_accounts resources :mutes, only: :index, controller: :muted_accounts
resources :lists, only: :index, controller: :lists
resources :domain_blocks, only: :index, controller: :blocked_domains
end end
resource :two_factor_authentication, only: [:show, :create, :destroy] resource :two_factor_authentication, only: [:show, :create, :destroy]