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

Fix crash when marking statuses as sensitive while some statuses are deleted #22134

Merged

Conversation

ClearlyClaire
Copy link
Contributor

Fixes #21910

Also fixes multiple statuses being marked as sensitive generating multiple strikes for the same report.

@ineffyble ineffyble added the bug Something isn't working label Dec 10, 2022
app/models/admin/status_batch_action.rb Outdated Show resolved Hide resolved
@github-actions
Copy link
Contributor

This pull request has merge conflicts that must be resolved before it can be merged.

@ClearlyClaire ClearlyClaire merged commit 21a1a8e into mastodon:main Jan 13, 2023
ClearlyClaire added a commit to ClearlyClaire/mastodon that referenced this pull request Feb 9, 2023
…deleted (mastodon#22134)

* Do not offer to mark statuses as sensitive if there is no undeleted status with media attachments

* Fix crash when marking statuses as sensitive while some statuses are deleted

Fixes mastodon#21910

* Fix multiple strikes being created for a single report when selecting “Mark as sensitive”

* Add tests
ClearlyClaire added a commit that referenced this pull request Feb 9, 2023
…deleted (#22134) (#23486)

* Do not offer to mark statuses as sensitive if there is no undeleted status with media attachments

* Fix crash when marking statuses as sensitive while some statuses are deleted

Fixes #21910

* Fix multiple strikes being created for a single report when selecting “Mark as sensitive”

* Add tests
atsu1125 pushed a commit to atsu1125/mastodon that referenced this pull request Feb 17, 2023
…deleted (mastodon#22134) (mastodon#23486)

* Do not offer to mark statuses as sensitive if there is no undeleted status with media attachments

* Fix crash when marking statuses as sensitive while some statuses are deleted

Fixes mastodon#21910

* Fix multiple strikes being created for a single report when selecting “Mark as sensitive”

* Add tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to resolve moderator report if a post has been deleted
3 participants