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

[feature] Store admin actions in the db, prevent conflicting actions #2167

Merged
merged 16 commits into from
Sep 4, 2023

Conversation

tsmethurst
Copy link
Contributor

@tsmethurst tsmethurst commented Aug 29, 2023

Description

If this is a code change, please include a summary of what you've coded, and link to the issue(s) it closes/implements.

If this is a documentation change, please briefly describe what you've changed and why.

This pull request updates our handing of admin actions (domain block, domain unblock, account suspend, etc) in the following ways:

When an admin action is performed on a domain or an account, store a record of that action in the database.

Previously, we only stored admin account actions.

Now, we can also store domain block / unblock actions (for starters), as well as completion time of said actions, and any errors that occurred while the action was being processed. In future this could be used to allow admins to review a timeline of actions. This is, imo, pretty sick 😎

Don't allow multiple actions that target the same resource to run at the same time.

This is achieved by storing running admin actions in a map keyed by [TargetCategory]/[TargetID], and removing them from the map when they're finished.

For example, a domain block for the domain example.org would have the key domain/example.org. A domain allow for the domain example.org would ALSO have the key domain/example.org. Same goes for another domain block for that domain. This ensures that these two actions cannot run at the same time. Now, an API request to perform a second action on an existing key will just get a 409 error back that looks something like:

AccountAction: an action (account/01H90S1CXQ97J9625C5YBXZWGT) is currently running (duration 25.566746ms) which conflicts with the attempted action: wait until this action is complete and try again

Checklist

Please put an x inside each checkbox to indicate that you've read and followed it: [ ] -> [x]

If this is a documentation change, only the first checkbox must be filled (you can delete the others if you want).

  • I/we have read the GoToSocial contribution guidelines.
  • I/we have discussed the proposed changes already, either in an issue on the repository, or in the Matrix chat.
  • I/we have performed a self-review of added code.
  • I/we have written code that is legible and maintainable by others.
  • I/we have commented the added code, particularly in hard-to-understand areas.
  • I/we have made any necessary changes to documentation.
  • I/we have added tests that cover new code.
  • I/we have run tests and they pass locally with the changes.
  • I/we have run go fmt ./... and golangci-lint run.

@tsmethurst
Copy link
Contributor Author

Think this should be ready to go!

@tsmethurst tsmethurst marked this pull request as ready for review August 31, 2023 11:20
@NyaaaWhatsUpDoc
Copy link
Member

nice work comrade 🤠 very nice looking PR 👩‍🍳 👌

@NyaaaWhatsUpDoc NyaaaWhatsUpDoc merged commit 3ed1ca6 into main Sep 4, 2023
@NyaaaWhatsUpDoc NyaaaWhatsUpDoc deleted the admin_action_locking branch September 4, 2023 13:55
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.

2 participants