diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-14 19:05:02 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-05-14 19:05:02 +0200 |
| commit | 14f6ce2885f7999f2fcbbdda6241a035271076d4 (patch) | |
| tree | e0db9d9bf95e61cf4c96cd6b94fcc6f2c07daaa1 /lib | |
| parent | 564106c5d6ddd781064bdaeba1994328d7aceeae (diff) | |
Record account suspend/silence time and keep track of domain blocks (#10660)
* Record account suspend/silence time and keep track of domain blocks * Also unblock users who were suspended/silenced before dates were recorded * Add tests * Keep track of suspending date for users suspended through the CLI * Show accurate number of accounts that would be affected by unsuspending an instance * Change migration to set silenced_at and suspended_at * Revert "Also unblock users who were suspended/silenced before dates were recorded" This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c. * Switch from using suspended and silenced to suspended_at and silenced_at * Add post-deployment migration script to remove `suspended` and `silenced` columns * Use Account#silence! and Account#suspend! instead of updating the underlying property * Add silenced_at and suspended_at migration to post-migration * Change account fabricator to translate suspended and silenced attributes * Minor fixes * Make unblocking domains always retroactive
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cli.rb | 2 | ||||
| -rw-r--r-- | lib/mastodon/accounts_cli.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/cli.rb b/lib/cli.rb index 5780e3e87..be276583d 100644 --- a/lib/cli.rb +++ b/lib/cli.rb @@ -106,7 +106,7 @@ module Mastodon [json, account.id, inbox_url] end - account.update_column(:suspended, true) + account.suspend! end processed += 1 diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb index 3131647f3..7d0215313 100644 --- a/lib/mastodon/accounts_cli.rb +++ b/lib/mastodon/accounts_cli.rb @@ -87,8 +87,8 @@ module Mastodon end end - account.suspended = false - user.account = account + account.suspended_at = nil + user.account = account if user.save if options[:confirmed] |