Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add tootctl domains purge options to select subdomains and keep domain blocks #22063

Merged
merged 6 commits into from
Jan 18, 2023

Conversation

ClearlyClaire
Copy link
Contributor

Fixes #21984

  • Add a --include-subdomains option to match both passed domains and their subdomains
  • Add support for the *. subdomain wildcard pattern regardless of --include-subdomains as people will somewhat frequently use it
  • Fix issues with custom emoji deletion
  • Change tootctl domains purge to not remove domain blocks by default, and add a --purge-domain-blocks option to recover that behavior: in most cases, if a domain block exists, admins do not actually want to remove it.

@ClearlyClaire ClearlyClaire marked this pull request as ready for review December 5, 2022 14:34
Copy link
Contributor

@connorshea connorshea left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You've got a lint failure, but otherwise LGTM

@ClearlyClaire ClearlyClaire mentioned this pull request Jan 16, 2023
15 tasks
@Gargron Gargron merged commit cb4e28f into mastodon:main Jan 18, 2023
btrd pushed a commit to btrd/mastodon that referenced this pull request Feb 22, 2023
…ain blocks (mastodon#22063)

* Add --include-subdomains option to tootctl domains purge

* Add support for '*.' subdomain wildcard patterns in `tootctl domains purge`

* Fix custom emojis deletion not following subdomain and URI options

* Change `tootctl domains purge` to not purge domain blocks unless --purge-domain-blocks is passed

* Refactor `tootctl domains purge`

* Add feedback on deleted domain blocks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

tootctl domains purge does not include subdomains, while instance blocks do
3 participants