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

This commit is contained in:
Claire
2021-02-03 17:02:48 +01:00
33 changed files with 453 additions and 319 deletions

View File

@@ -402,7 +402,7 @@ module Mastodon
exit(1)
end
parallelize_with_progress(target_account.followers.local) do |account|
processed, = parallelize_with_progress(target_account.followers.local) do |account|
UnfollowService.new.call(account, target_account)
end

View File

@@ -113,7 +113,7 @@ module Mastodon
result = entry.destroy
if result
processed += 1 + children_count
processed += children_count + 1
else
say("#{domain} could not be unblocked.", :red)
failed += 1