diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-05-15 17:11:40 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-15 17:11:40 +0200 |
commit | 6badf2d252a980d496b894c7258a778c57639953 (patch) | |
tree | b7c71885c413a8205dbe9d01bab7c60ea75c11bf /app/services/suspend_account_service.rb | |
parent | cd534830adab89300703904ffe87894dec8e2f95 (diff) | |
parent | f4f22391b2d469bd1d5c29ec815daf020282f30c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/services/suspend_account_service.rb')
-rw-r--r-- | app/services/suspend_account_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb index 6c2ecad30..412873f84 100644 --- a/app/services/suspend_account_service.rb +++ b/app/services/suspend_account_service.rb @@ -88,8 +88,8 @@ class SuspendAccountService < BaseService return if @options[:destroy] - @account.silenced = false - @account.suspended = true + @account.silenced_at = nil + @account.suspended_at = @options[:suspended_at] || Time.now.utc @account.locked = false @account.display_name = '' @account.note = '' |