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 Undo Announce activity is not sent, when not followed by the reblogged post author #18482

Merged

Conversation

MitarashiDango
Copy link
Contributor

fix #18471

@ClearlyClaire
Copy link
Contributor

This Pull Request looks correct, but I wonder if it wouldn't make more sense to change the StatusReachFinder to include the author of the reblogged status. This would also require a change to ReblogService to avoid sending the ActivityPub payload twice, though.

@MitarashiDango
Copy link
Contributor Author

When I was investigating a bug, I was planning to add a process to StatusReachFinder.
Therefore, there is no objection to the policy of unifying the processing with StatusReachFinder.

If it is not necessary to integrate the processes of ReblogStatus and RemoveStatusService as a refactoring task separate from this Pull-Request, this Pull-Request will be used to integrate the processes.

@MitarashiDango
Copy link
Contributor Author

MitarashiDango commented May 29, 2022

Merged reblog and unreblog notification processes into the StatusReachFinder.
Currently making additional corrections.

@MitarashiDango
Copy link
Contributor Author

When sending Announce activity or Undo Announce activity, should the ID of the poster of the original post be included in the to? Or should it be included in cc?

app/lib/status_reach_finder.rb Outdated Show resolved Hide resolved
@nightpool
Copy link
Member

When sending Announce activity or Undo Announce activity, should the ID of the poster of the original post be included in the to? Or should it be included in cc?

I don't think it really matters. IMO to makes more sense, but if it complicates the code too much to add it, then cc should be fine

@MitarashiDango
Copy link
Contributor Author

When sending Announce activity or Undo Announce activity, should the ID of the poster of the original post be included in the to? Or should it be included in cc?

When I checked the implementation part before fixing this problem, the process of adding the url of the poster of the original post to cc was already implemented.

cc << uri_for(status.reblog.account) if status.reblog?

Therefore, in order to make the content of the generated activity consistent, we will not implement the process of adding id to to, and we will leave this process as it is.
Instead, I'm thinking of modifying the test code to expect the id to be included in cc, is that okay?

@ClearlyClaire
Copy link
Contributor

Therefore, in order to make the content of the generated activity consistent, we will not implement the process of adding id to to, and we will leave this process as it is. Instead, I'm thinking of modifying the test code to expect the id to be included in cc, is that okay?

Sounds good to me!

Also, the reblog_service_spec.rb tests need change, because they stub ActivityPub::DistributionWorker and expect the delivery to the reblogged user to happen somewhere else.

@MitarashiDango
Copy link
Contributor Author

Deleted tests that are no longer needed and added tests.

ClearlyClaire
ClearlyClaire previously approved these changes Jun 1, 2022
Copy link
Contributor

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

@ClearlyClaire ClearlyClaire added bug Something isn't working to backport PR needed to be backported labels Jan 10, 2024
@ClearlyClaire
Copy link
Contributor

Sorry this PR slipped through. I'll rebase it and make sure it's merged!

@ClearlyClaire ClearlyClaire dismissed nightpool’s stale review January 10, 2024 14:39

the requested change has been addressed

Copy link
Contributor

This pull request has resolved merge conflicts and is ready for review.

@ClearlyClaire ClearlyClaire requested a review from a team January 12, 2024 12:54
@ClearlyClaire ClearlyClaire added this pull request to the merge queue Jan 12, 2024
Merged via the queue into mastodon:main with commit 2c05b8a Jan 12, 2024
26 checks passed
mjankowski pushed a commit to mjankowski/mastodon that referenced this pull request Jan 15, 2024
ClearlyClaire added a commit that referenced this pull request Jan 15, 2024
ClearlyClaire added a commit that referenced this pull request Jan 23, 2024
This was referenced Jan 23, 2024
ClearlyClaire added a commit that referenced this pull request Jan 24, 2024
ClearlyClaire added a commit that referenced this pull request Jan 24, 2024
noellabo pushed a commit to fedibird/mastodon that referenced this pull request Jan 24, 2024
kmycode pushed a commit to kmycode/mastodon that referenced this pull request Jan 24, 2024
ttrace pushed a commit to ttrace/mastodon that referenced this pull request Feb 2, 2024
atsu1125 pushed a commit to atsu1125/mastodon that referenced this pull request Feb 2, 2024
@ClearlyClaire ClearlyClaire removed the to backport PR needed to be backported label May 10, 2024
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.

Undo Announce activity is not sent when unboosting posts from unfollowed remote accounts
4 participants