search

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
734 stars 56 forks source link

WIP! Merge upstream changes from Mastodon 4.2.x #1325

Closed nachtjasmin closed 7 months ago

nachtjasmin commented 11 months ago

Update: 2023-11-16, I'm working on it again! :partying_face:

Since there are a number of useful additions in the latest Mastodon versions and with Mastodon 4.2 lurking around the corner, I've tried to merge the upstream changes of Mastodon 4.1.6 into Hometown.

I know that you were already working on it, I just haven't found the branch for that, so sorry if this causes additional work now.

Unfortunately, this also reverts your changes to the mobile interface. As much as I like it, it also breaks custom themes like Tangerine, therefore I'm fine with it.

Notes about merge conflicts

I haven't tracked what I've done, but in general there was no automatic merge resolution.

  1. Everything critical (models, streaming API) was reviewed manually and should continue as expected with the Hometown-specific features.
  2. The import/export feature was taken as-is from Mastodon as I think that there are no differences between the features.
  3. The translations were merged, which also means the "Publish" button got renamed to "Post" again (or vice-versa? idk.) And in general, I've tried to incorporate the upstream translations as good as possible, because it's going to make future merges easier.

TODO

graue commented 10 months ago

Thank you for working on this! I would love to be able to deploy a Hometown with the fixes from v4.1.x merged in.

dariusk commented 9 months ago

Thanks - I am going to take a week to do a proper 4.2.0 merge and have that be the next release. My plan is to maintain the custom mobile UI support in that release.

nachtjasmin commented 7 months ago

Closed in favor of #1337. (okay, I was just lucky with this number :sunglasses:)