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

Merge changes of 4.0.7..4.0.10 #1324

Conversation

nachtjasmin
Copy link

@nachtjasmin nachtjasmin commented Aug 1, 2023

This includes all changes made in https://github.com/mastodon/mastodon/releases/tag/v4.0.7 and https://github.com/mastodon/mastodon/releases/tag/v4.0.8 and therefore requires:

⚠️ Restart of all Mastodon processes, especially the Streaming API

There was a conflict during the merge inside the streaming/index.js, which was related to the following snippet:

      // Only send local-only statuses to logged-in users
      if (payload.local_only && !req.accountId) {
        log.silly(req.requestId, `Message ${payload.id} filtered because it was local-only`);
        return;
      }

I've placed it at the same spot where it was previously, so everything should work as before. However, I still need to test those changes, which is what I'll be doing after submitting this PR as draft.

Checked the changes against our instance, everything is working as expected as logged-in user. Haven't checked the public timelines where the above snippet would be relevant, as we are using AUTHORIZED_FETCH and I would like to keep it enabled. ^^

If the base branch is not correct, feel free to change it.

Everything is already deployed on queer.group and working fine there.

@nachtjasmin nachtjasmin marked this pull request as ready for review August 1, 2023 11:15
@nachtjasmin nachtjasmin changed the title Merge changes of 4.0.7 and 4.0.8 Merge changes of 4.0.7..4.0.10 Sep 19, 2023
@dariusk
Copy link

dariusk commented Sep 20, 2023

Thank you for all your work! Merging this to the branch, then will test locally, then do the release if all goes well.

@dariusk dariusk merged commit 3b69a29 into hometown-fork:hometown-4.0.6-merge Sep 20, 2023
1 check passed
@TixieSalander
Copy link

Thank you for your work on this update!

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.

10 participants