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

Reject existing Follow in addition to sending a Block #9811

Merged
merged 1 commit into from Jan 18, 2019

Conversation

Projects
None yet
2 participants
@ThibG
Copy link
Collaborator

ThibG commented Jan 14, 2019

Mastodon expects remote servers to remove follow relationships upon receiving
a Block. However, the spec only evokes Block activities in a C2S context, never
in a S2S context.

This PR, in addition to federating the Block, explicitly sends a Reject for any
affected follow relationship, which makes a bit more sense with regards to the
spec.

Marked Work in Progress as I have to check the generated Activity.

@ThibG ThibG force-pushed the ThibG:fixes/block-unfollow branch 4 times, most recently from 0068f25 to b798b93 Jan 14, 2019

@ThibG ThibG removed the work in progress label Jan 14, 2019

Show resolved Hide resolved app/services/unfollow_service.rb Outdated
Reject existing Follow in addition to sending a Block
Mastodon expects remote servers to remove follow relationships upon receiving
a Block. However, the spec only evokes Block activities in a C2S context, never
in a S2S context.

This PR, in addition to federating the Block, explicitly sends a Reject for any
affected follow relationship, which makes a bit more sense with regards to the
spec.

@ThibG ThibG force-pushed the ThibG:fixes/block-unfollow branch from b798b93 to a8df40e Jan 17, 2019

@ThibG

This comment has been minimized.

Copy link
Collaborator Author

ThibG commented Jan 18, 2019

(Addressed comments)

@Gargron Gargron merged commit aeb1244 into tootsuite:master Jan 18, 2019

11 checks passed

ci/circleci: build Your tests passed on CircleCI!
Details
ci/circleci: check-i18n Your tests passed on CircleCI!
Details
ci/circleci: install Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.4 Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.5 Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.6 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.4 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.5 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.6 Your tests passed on CircleCI!
Details
ci/circleci: test-webui Your tests passed on CircleCI!
Details
codeclimate All good!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment