diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-15 18:44:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-15 18:44:21 +0200 |
| commit | c1cf8c1636e0a639cced585f0cb234547a64d417 (patch) | |
| tree | 77b40e8bb0b1682bebaebebfa32d135ba406ac14 /app/services/suspend_account_service.rb | |
| parent | 4bab7d7640a72ffeb04c104a93ad6d3d5700c712 (diff) | |
| parent | 6badf2d252a980d496b894c7258a778c57639953 (diff) | |
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 = '' |