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

2022-01-07 19:51:47 +01:00
parent e2933854ac bc066d8936
commit fca50e4b50
7 changed files with 682 additions and 695 deletions
--- a/app/services/purge_domain_service.rb
+++ b/app/services/purge_domain_service.rb
@@ -5,6 +5,7 @@ class PurgeDomainService < BaseService
    Account.remote.where(domain: domain).reorder(nil).find_each do |account|
      DeleteAccountService.new.call(account, reserve_username: false, skip_side_effects: true)
    end
+    CustomEmoji.remote.where(domain: domain).reorder(nil).find_each(&:destroy)
    Instance.refresh
  end
 end