Merge branch 'master' into glitch-soc/merge-upstream

2018-12-06 12:44:38 +01:00
parent fe9340d95e 155cf12680
commit 1df392819d
16 changed files with 258 additions and 152 deletions
--- a/lib/mastodon/domains_cli.rb
+++ b/lib/mastodon/domains_cli.rb
@ -22,11 +22,7 @@ module Mastodon
      dry_run = options[:dry_run] ? ' (DRY RUN)' : ''

      Account.where(domain: domain).find_each do |account|
-        unless options[:dry_run]
-          SuspendAccountService.new.call(account)
-          account.destroy
-        end
-
+        SuspendAccountService.new.call(account, destroy: true) unless options[:dry_run]
        removed += 1
        say('.', :green, false)
      end