diff options
author | Reverite <github@reverite.sh> | 2019-05-15 11:12:17 -0700 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-05-15 11:12:17 -0700 |
commit | 4cea89bf2e9ce7f73fccfc637191b1e039ad25ee (patch) | |
tree | cc559ad868e13d934ff539bd2da836ddad3ea5fc /app/services/resolve_account_service.rb | |
parent | cdb159f27e2aeb2cf3bb184ac20b7056b013f714 (diff) | |
parent | c1cf8c1636e0a639cced585f0cb234547a64d417 (diff) |
Merge branch 'glitch' into production
Diffstat (limited to 'app/services/resolve_account_service.rb')
-rw-r--r-- | app/services/resolve_account_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/resolve_account_service.rb b/app/services/resolve_account_service.rb index 4ff351c5f..11e33a83a 100644 --- a/app/services/resolve_account_service.rb +++ b/app/services/resolve_account_service.rb @@ -119,9 +119,9 @@ class ResolveAccountService < BaseService Rails.logger.debug "Creating new remote account for #{@username}@#{@domain}" @account = Account.new(username: @username, domain: @domain) - @account.suspended = true if auto_suspend? - @account.silenced = true if auto_silence? - @account.private_key = nil + @account.suspended_at = domain_block.created_at if auto_suspend? + @account.silenced_at = domain_block.created_at if auto_silence? + @account.private_key = nil end def update_account |