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 /db | |
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 'db')
-rw-r--r-- | db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb | 41 | ||||
-rw-r--r-- | db/post_migrate/20190511152737_remove_suspended_silenced_account_fields.rb | 45 | ||||
-rw-r--r-- | db/schema.rb | 6 |
3 files changed, 89 insertions, 3 deletions
diff --git a/db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb b/db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb new file mode 100644 index 000000000..1e5cd669c --- /dev/null +++ b/db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb @@ -0,0 +1,41 @@ +class AddSilencedAtSuspendedAtToAccounts < ActiveRecord::Migration[5.2] + class Account < ApplicationRecord + # Dummy class, to make migration possible across version changes + end + + class DomainBlock < ApplicationRecord + # Dummy class, to make migration possible across version changes + enum severity: [:silence, :suspend, :noop] + + has_many :accounts, foreign_key: :domain, primary_key: :domain + end + + def up + add_column :accounts, :silenced_at, :datetime + add_column :accounts, :suspended_at, :datetime + + # Record suspend date of blocks and silences for users whose limitations match + # a domain block + DomainBlock.where(severity: [:silence, :suspend]).find_each do |block| + scope = block.accounts + if block.suspend? + block.accounts.where(suspended: true).in_batches.update_all(suspended_at: block.created_at) + else + block.accounts.where(silenced: true).in_batches.update_all(silenced_at: block.created_at) + end + end + + # Set dates for accounts which have limitations not related to a domain block + Account.where(suspended: true, suspended_at: nil).in_batches.update_all(suspended_at: Time.now.utc) + Account.where(silenced: true, silenced_at: nil).in_batches.update_all(silenced_at: Time.now.utc) + end + + def down + # Block or silence accounts that have a date set + Account.where(suspended: false).where.not(suspended_at: nil).in_batches.update_all(suspended: true) + Account.where(silenced: false).where.not(silenced_at: nil).in_batches.update_all(silenced: true) + + remove_column :accounts, :silenced_at + remove_column :accounts, :suspended_at + end +end diff --git a/db/post_migrate/20190511152737_remove_suspended_silenced_account_fields.rb b/db/post_migrate/20190511152737_remove_suspended_silenced_account_fields.rb new file mode 100644 index 000000000..a46349cb7 --- /dev/null +++ b/db/post_migrate/20190511152737_remove_suspended_silenced_account_fields.rb @@ -0,0 +1,45 @@ +# frozen_string_literal: true + +class RemoveSuspendedSilencedAccountFields < ActiveRecord::Migration[5.2] + class Account < ApplicationRecord + # Dummy class, to make migration possible across version changes + end + + class DomainBlock < ApplicationRecord + # Dummy class, to make migration possible across version changes + enum severity: [:silence, :suspend, :noop] + + has_many :accounts, foreign_key: :domain, primary_key: :domain + end + + disable_ddl_transaction! + + def up + # Record suspend date of blocks and silences for users whose limitations match + # a domain block + DomainBlock.where(severity: [:silence, :suspend]).find_each do |block| + scope = block.accounts + if block.suspend? + block.accounts.where(suspended: true).in_batches.update_all(suspended_at: block.created_at) + else + block.accounts.where(silenced: true).in_batches.update_all(silenced_at: block.created_at) + end + end + + # Set dates for accounts which have limitations not related to a domain block + Account.where(suspended: true, suspended_at: nil).in_batches.update_all(suspended_at: Time.now.utc) + Account.where(silenced: true, silenced_at: nil).in_batches.update_all(silenced_at: Time.now.utc) + + safety_assured do + remove_column :accounts, :suspended, :boolean, null: false, default: false + remove_column :accounts, :silenced, :boolean, null: false, default: false + end + end + + def down + safety_assured do + add_column :accounts, :suspended, :boolean, null: false, default: false + add_column :accounts, :silenced, :boolean, null: false, default: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 4dcbea4e7..782727942 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_09_164208) do +ActiveRecord::Schema.define(version: 2019_05_11_152737) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -131,8 +131,6 @@ ActiveRecord::Schema.define(version: 2019_05_09_164208) do t.datetime "header_updated_at" t.string "avatar_remote_url" t.datetime "subscription_expires_at" - t.boolean "silenced", default: false, null: false - t.boolean "suspended", default: false, null: false t.boolean "locked", default: false, null: false t.string "header_remote_url", default: "", null: false t.datetime "last_webfingered_at" @@ -148,6 +146,8 @@ ActiveRecord::Schema.define(version: 2019_05_09_164208) do t.string "actor_type" t.boolean "discoverable" t.string "also_known_as", array: true + t.datetime "silenced_at" + t.datetime "suspended_at" t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin t.index "lower((username)::text), lower((domain)::text)", name: "index_accounts_on_username_and_domain_lower", unique: true t.index ["moved_to_account_id"], name: "index_accounts_on_moved_to_account_id" |