Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order #9687
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ClearlyClaire
force-pushed
the
fixes/block-unblock-race-unfollow
branch
2 times, most recently
from
b6e6153
to
7c0ad87
Compare
ClearlyClaire
force-pushed
the
fixes/block-unblock-race-unfollow
branch
from
7c0ad87
to
af6ad4d
Compare
Gargron
approved these changes
Jan 2, 2019
hiyuki2578
pushed a commit
to ProjectMyosotis/mastodon
that referenced
this pull request
Oct 2, 2019
…ed out of order (mastodon#9687) * Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order * Add specs for Block causing unfollow and for out-of-order Block + Undo
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Block+Undo Blockhave been used for a while to remove followers (even though Mastodon now also handles the cleanerUndo Accept+Reject Follow, but that flow is not explicitly defined in the AP spec).However, such activities are processed in (and even sent from) sidekiq queues and could therefore be processed out-of-order, in which case the current code skips the
Blockentirely, which could cause theBlock+Undo Blockroutine to fail from removing the follow relationship on the receiving end, meaning the temporarily blocked user would still receive private toots if there is another follower on the same instance.This commit fixes that.