hometown-fork / hometown

A supported fork of Mastodon that provides local posting and a wider range of content types.
GNU Affero General Public License v3.0
753 stars 57 forks source link

Merge changes of 4.0.7..4.0.10 #1324

Closed nachtjasmin closed 1 year ago

nachtjasmin commented 1 year ago

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:

:warning: 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.

dariusk commented 1 year ago

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

TixieSalander commented 1 year ago

Thank you for your work on this update!