Record account suspend/silence time and keep track of domain blocks #10660

ClearlyClaire · 2019-05-01T09:41:27Z

Currently, undoing an instance block will either unblock every blocked person on that instance or none (depending on the moderator's choice), because an instance block translates to an individual block for every user of that instance.

This change records the time an user was blocked, and ties the unblock part to blocks performed exactly at the same time as the instance block.

This is a work in progress because we have to figure out what to do with instances that were blocked before that PR. The code in the PR will not unblock them, which is probably not what we want to do. The proposed code will currently unblock anyone that matches the severity of the domain block and who was individually blocked before the migration was run.

~~Also need to add tests and make sure the interface is clear.~~

ClearlyClaire · 2019-05-01T11:50:40Z

Updated. The unblock screen won't ask whether you want to unblock all existing accounts of that instance anymore, and will instead give the count of accounts that would actually be unblocked.

The accounts affected are those whose block date matches that of the domain block or are nil. That is, those who were definitely blocked through the domain block as well as those who were blocked before the feature was merged. There's a few things we could do slightly differently in that regard, but not much.

Gargron

We could remove the booleans

ClearlyClaire · 2019-05-01T16:21:49Z

We definitely could, I just wanted to avoid a costly and error-prone migration script. Le 1 mai 2019 17:55:22 GMT+02:00, Eugen Rochko <notifications@github.com> a écrit :

…

Gargron commented on this pull request. We could remove the booleans -- You are receiving this because you authored the thread. Reply to this email directly or view it on GitHub: #10660 (review)

-- Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.

nightpool · 2019-05-09T23:26:45Z

I think the idea here is good but removing the boolean columns now is going to save us a ton of headaches down the road wrt our data model.

If you really really don't want to remove the booleans, then we should encapsulate any logic that refers to the booleans or the dates into the account model so that we only have to care about the legacy data model in one place.

…rded

…ng an instance

…ere recorded" This reverts commit a015c65.

ClearlyClaire · 2019-05-11T13:38:03Z

I have changed the migration script to set the silenced_at and suspended_at fields of existing accounts to the date of the corresponding domain block if there is one, and to the current time otherwise.
I have changed the code to not use the suspended and silenced fields anymore and updated the tests accordingly.
Finally, I have added a post-deployment migration script to remove those columns from the database.

~~I have not tried the migration yet.~~ I have tried on my dev and “production” instances. It seems to work.

…ced` columns

nightpool

First pass. I think we can narrow down the amount of files touched by this change, especially spec files as noted below. We should make sure we're using the suspend! and silence! methods in specs going forward.

spec/services/notify_service_spec.rb

db/post_migrate/20190511152737_remove_suspended_silenced_account_fields.rb

lib/cli.rb

spec/controllers/application_controller_spec.rb

…erlying property

nightpool

now that we can undo domain blocks precisely, is there any argument for leaving in the ability to undo them and NOT unsilence/unsuspend affected users? it seems like an extra level of complexity that doesn't help anyone

app/models/account.rb

app/services/resolve_account_service.rb

ClearlyClaire · 2019-05-12T11:08:48Z

Removed the retroactive option as suggested, making all unblocks/unsilences retroactive.

This removes the checkbox but not the text:

spec/services/block_domain_service_spec.rb

nightpool

LGTM % a minor question about the tests

ghost · 2019-05-29T09:03:44Z

I think this has broken the explore page:

method=GET path=/explore format=html controller=DirectoriesController action=index status=500 error='ActiveRecord::StatementInvalid: PG::UndefinedColumn: ERROR:  column accounts.suspended does not exist

Gargron · 2019-05-29T09:05:34Z

Need to tootctl cache clear

Fix a regression from mastodon#10660

Fix a regression from #10660

…astodon#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 a015c65. * 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

Fix a regression from mastodon#10660

…astodon#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 a015c65. * 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

Fix a regression from mastodon#10660

ClearlyClaire added the work in progress Not to be merged, currently being worked on label May 1, 2019

ClearlyClaire force-pushed the fixes/instance-individual-vs-wide-blocks branch 3 times, most recently from 73ce2d3 to 7b7a442 Compare May 1, 2019 11:13

ClearlyClaire removed the work in progress Not to be merged, currently being worked on label May 1, 2019

ClearlyClaire marked this pull request as ready for review May 1, 2019 11:34

ClearlyClaire force-pushed the fixes/instance-individual-vs-wide-blocks branch 2 times, most recently from 2a33831 to 91cf394 Compare May 1, 2019 11:48

Gargron reviewed May 1, 2019

View reviewed changes

ClearlyClaire mentioned this pull request May 1, 2019

Domain blocks cannot be upgraded #10608

Closed

ClearlyClaire added 5 commits May 11, 2019 13:55

Record account suspend/silence time and keep track of domain blocks

30296f1

Also unblock users who were suspended/silenced before dates were reco…

a015c65

…rded

Add tests

a7c6671

Keep track of suspending date for users suspended through the CLI

9d7801f

Show accurate number of accounts that would be affected by unsuspendi…

474bbfd

…ng an instance

ClearlyClaire force-pushed the fixes/instance-individual-vs-wide-blocks branch from 91cf394 to 474bbfd Compare May 11, 2019 12:00

ClearlyClaire added 2 commits May 11, 2019 14:31

Change migration to set silenced_at and suspended_at

224c371

Revert "Also unblock users who were suspended/silenced before dates w…

c43b56f

…ere recorded" This reverts commit a015c65.

ClearlyClaire force-pushed the fixes/instance-individual-vs-wide-blocks branch 3 times, most recently from 023e3c0 to 51ea81a Compare May 11, 2019 13:26

ClearlyClaire added 2 commits May 11, 2019 15:43

Switch from using suspended and silenced to suspended_at and silenced_at

930c674

Add post-deployment migration script to remove suspended and `silen…

518b373

…ced` columns

ClearlyClaire force-pushed the fixes/instance-individual-vs-wide-blocks branch from 2ec9f35 to 518b373 Compare May 11, 2019 13:43

nightpool requested changes May 11, 2019

View reviewed changes

Use Account#silence! and Account#suspend! instead of updating the und…

986a4d5

…erlying property

ClearlyClaire force-pushed the fixes/instance-individual-vs-wide-blocks branch from 5d44a17 to e9b944e Compare May 11, 2019 17:27

Add silenced_at and suspended_at migration to post-migration

db22b4c

ClearlyClaire force-pushed the fixes/instance-individual-vs-wide-blocks branch 2 times, most recently from db22b4c to 986a4d5 Compare May 11, 2019 18:27

Change account fabricator to translate suspended and silenced attributes

fe0f5ee

nightpool requested changes May 11, 2019

View reviewed changes

ClearlyClaire force-pushed the fixes/instance-individual-vs-wide-blocks branch 2 times, most recently from 6ed0a26 to 320d417 Compare May 12, 2019 11:07

nightpool reviewed May 13, 2019

View reviewed changes

spec/services/block_domain_service_spec.rb Outdated Show resolved Hide resolved

nightpool approved these changes May 13, 2019

View reviewed changes

ClearlyClaire added 2 commits May 13, 2019 10:22

Minor fixes

46537b7

Make unblocking domains always retroactive

7d7a58c

ClearlyClaire force-pushed the fixes/instance-individual-vs-wide-blocks branch from 320d417 to 7d7a58c Compare May 13, 2019 08:22

Gargron merged commit 14f6ce2 into mastodon:master May 14, 2019

mayaeh mentioned this pull request May 29, 2019

i18n: Update Japanese translations #10875

Merged

ClearlyClaire added a commit to ClearlyClaire/mastodon that referenced this pull request Jun 18, 2019

Fix User.active returning (only) suspended users

751c064

Fix a regression from mastodon#10660

ClearlyClaire mentioned this pull request Jun 18, 2019

Fix User.active returning (only) suspended users #11111

Merged

Gargron pushed a commit that referenced this pull request Jun 18, 2019

Fix User#active scope only returning suspended users (#11111)

17747e2

Fix a regression from #10660

hiyuki2578 pushed a commit to ProjectMyosotis/mastodon that referenced this pull request Oct 2, 2019

Fix User#active scope only returning suspended users (mastodon#11111)

5e18611

Fix a regression from mastodon#10660

messenjahofchrist pushed a commit to Origin-Creative/mastodon that referenced this pull request Jul 30, 2021

Fix User#active scope only returning suspended users (mastodon#11111)

c16a58d

Fix a regression from mastodon#10660

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Record account suspend/silence time and keep track of domain blocks #10660

Record account suspend/silence time and keep track of domain blocks #10660

ClearlyClaire commented May 1, 2019 •

edited

Loading

ClearlyClaire commented May 1, 2019

Gargron left a comment

ClearlyClaire commented May 1, 2019 via email

nightpool commented May 9, 2019

ClearlyClaire commented May 11, 2019 •

edited

Loading

nightpool left a comment

nightpool left a comment

ClearlyClaire commented May 12, 2019

nightpool left a comment

ghost commented May 29, 2019

Gargron commented May 29, 2019

Record account suspend/silence time and keep track of domain blocks #10660

Record account suspend/silence time and keep track of domain blocks #10660

Conversation

ClearlyClaire commented May 1, 2019 • edited Loading

ClearlyClaire commented May 1, 2019

Gargron left a comment

Choose a reason for hiding this comment

ClearlyClaire commented May 1, 2019 via email

nightpool commented May 9, 2019

ClearlyClaire commented May 11, 2019 • edited Loading

nightpool left a comment

Choose a reason for hiding this comment

nightpool left a comment

Choose a reason for hiding this comment

ClearlyClaire commented May 12, 2019

nightpool left a comment

Choose a reason for hiding this comment

ghost commented May 29, 2019

Gargron commented May 29, 2019

ClearlyClaire commented May 1, 2019 •

edited

Loading

ClearlyClaire commented May 11, 2019 •

edited

Loading