瀏覽代碼

Change domain block behavior to update user records before deleting data (#12247)

When suspending or silencing a domain, one probably wants the silence or
suspend parts to take effect as soon as possible. Deleting media files can
take a while (possibly days), so perform silencing as soon as possible, and
clean up media afterwards.
master^2
ThibG 4 年之前
committed by Eugen Rochko
父節點
當前提交
c4d45765e3
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. +2
    -2
      app/services/block_domain_service.rb

+ 2
- 2
app/services/block_domain_service.rb 查看文件

@@ -20,13 +20,13 @@ class BlockDomainService < BaseService
end end


def process_domain_block! def process_domain_block!
clear_media! if domain_block.reject_media?

if domain_block.silence? if domain_block.silence?
silence_accounts! silence_accounts!
elsif domain_block.suspend? elsif domain_block.suspend?
suspend_accounts! suspend_accounts!
end end

clear_media! if domain_block.reject_media?
end end


def invalidate_association_caches! def invalidate_association_caches!


Loading…
取消
儲存