From 7fc7437d05bf1441bb694b847f7e65ce37cd74fa Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 1 Jan 2019 13:44:04 +0100 Subject: [PATCH] Add CSV export for lists and domain blocks (#9677) Fix #6893 Fix #9268 --- .../exports/blocked_domains_controller.rb | 19 ++++++++++ .../settings/exports/lists_controller.rb | 19 ++++++++++ app/models/export.rb | 38 +++++++++++++++++-- app/views/settings/exports/show.html.haml | 8 ++++ config/routes.rb | 2 + 5 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 app/controllers/settings/exports/blocked_domains_controller.rb create mode 100644 app/controllers/settings/exports/lists_controller.rb diff --git a/app/controllers/settings/exports/blocked_domains_controller.rb b/app/controllers/settings/exports/blocked_domains_controller.rb new file mode 100644 index 0000000000..6676ce3401 --- /dev/null +++ b/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 diff --git a/app/controllers/settings/exports/lists_controller.rb b/app/controllers/settings/exports/lists_controller.rb new file mode 100644 index 0000000000..cf5a9de44b --- /dev/null +++ b/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 diff --git a/app/models/export.rb b/app/models/export.rb index 0eeac0dc07..a2520e9c24 100644 --- a/app/models/export.rb +++ b/app/models/export.rb @@ -9,15 +9,33 @@ class Export end def to_blocked_accounts_csv - to_csv account.blocking + to_csv account.blocking.select(:username, :domain) end def to_muted_accounts_csv - to_csv account.muting + to_csv account.muting.select(:username, :domain) end 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 def total_storage @@ -32,6 +50,10 @@ class Export account.following_count end + def total_lists + account.owned_lists.count + end + def total_followers account.followers_count end @@ -44,13 +66,21 @@ class Export account.muting.count end + def total_domain_blocks + account.domain_blocks.count + end + private def to_csv(accounts) CSV.generate do |csv| accounts.each do |account| - csv << [(account.local? ? account.local_username_and_domain : account.acct)] + csv << [acct(account)] end end end + + def acct(account) + account.local? ? account.local_username_and_domain : account.acct + end end diff --git a/app/views/settings/exports/show.html.haml b/app/views/settings/exports/show.html.haml index 6c030b1ab7..b13cea976a 100644 --- a/app/views/settings/exports/show.html.haml +++ b/app/views/settings/exports/show.html.haml @@ -16,6 +16,10 @@ %th= t('exports.follows') %td= number_with_delimiter @export.total_follows %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 %th= t('accounts.followers', count: @export.total_followers) %td= number_with_delimiter @export.total_followers @@ -28,6 +32,10 @@ %th= t('exports.mutes') %td= number_with_delimiter @export.total_mutes %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') diff --git a/config/routes.rb b/config/routes.rb index 1556aa5774..6e4da48a08 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -94,6 +94,8 @@ Rails.application.routes.draw do resources :follows, only: :index, controller: :following_accounts resources :blocks, only: :index, controller: :blocked_accounts resources :mutes, only: :index, controller: :muted_accounts + resources :lists, only: :index, controller: :lists + resources :domain_blocks, only: :index, controller: :blocked_domains end resource :two_factor_authentication, only: [:show, :create, :destroy]