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 account URI when updating ActivityPub account #7488

Merged
merged 1 commit into from May 14, 2018

Conversation

wiktor-k
Copy link
Contributor

Updates account uri field on each call to update_account instead of only once during create_account to mirror the same behavior in OStatus ResolveAccountService class.

ActivityPub accounts are identified using @username and @domain pair instead of URI since #6842.

This fixes a bug when the account identified by @username and @domain changes its URI (#7479).

@wiktor-k
Copy link
Contributor Author

I've never had such a quick reply for a PR, @Gargron are you running a review bot? :-)

@Gargron
Copy link
Member

Gargron commented May 14, 2018

No but you changed one line, explained what you were doing, and you are closing a bug report. I suppose the only way this PR could be better if you included the string "Fix #7479" anywhere in commit message or PR body so the bug would be automatically closed when this is merged.

@wiktor-k
Copy link
Contributor Author

Good idea, let me replace this commit in a minute...

Updates account `uri` field on each call to `update_account` instead of
only once during `create_account` to mirror the same behavior in OStatus
`ResolveAccountService` class [0].

ActivityPub accounts are identified using `@username` and `@domain` pair
instead of URI since mastodon#6842.

This fixes mastodon#7479: a bug when the account identified by `@username` and
`@domain` changes its URI.

[0]:
https://github.com/tootsuite/mastodon/blob/03b69ebc450efc07246bd64204276941b7ede3fc/app/services/resolve_account_service.rb#L121
@Gargron Gargron merged commit 7fe2993 into mastodon:master May 14, 2018
@wiktor-k wiktor-k deleted the activitypub-uri branch May 14, 2018 20:57
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.

None yet

2 participants