-
Notifications
You must be signed in to change notification settings - Fork 58
Bringing Hometown up to date with mastodon/mastodon #1371
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
base: hometown-dev
Are you sure you want to change the base?
Bringing Hometown up to date with mastodon/mastodon #1371
Conversation
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…non-bugfix updates (mastodon#32106)
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This should not change the set of words matched by `USERNAME_RE` but does change the one matched by `MENTION_RE`. Indeed, the previous regexp allowed a domain part to start with `.` or `-`, which the new regexp does not allow.
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Add limit on inbox payload size The 1MB limit is consistent with the limit we use when fetching remote resources * Add limit to number of options from federated polls * Add a limit to the number of federated profile fields * Add limit on federated username length * Add hard limits for federated display name and account bio * Add hard limits for `alsoKnownAs` and `attributionDomains` * Add hard limit on federated custom emoji shortcode * Highlight most destructive limits and expand on their reasoning
|
Merged in Mastodon 4.5.5. |
|
So, I just performed the task and migrated a running instance from 4.2 to 4.5. 😅 It worked surprisingly well! Kudos! 🥳 The database migrations were all cleanly applied and from what I was able to observe, nothing broke there! The most important change I had to apply were the new Active Record encryption secrets of the 4.3.0 release.
After that, I just executed the migration in two steps, similar to the description on the 4.3 release. All in all, the migrations took maybe 2 to 3 minutes on our 35GB (uncompressed) database. Issues I foundMissing information in localesRight now, the rendering of several haml files is failing because of: Because of this, Mastodon was first replying with the generic error response (the sad elephant). No ability to toot local-only?
I forgot to run |
|
Thank you! I'll try to get that HAML fixed. You wouldn't happen to remember which ones were broken, would you? |
So, should be one of the following two files:
|
|
Thanks! Pushed a fix. I see that you figured out the local-only posting too. |
714df8f to
d364ecb
Compare
|
@mistydemeo thank you! And yea, figured the local-only posting out as well, should've mentioned that explicitly again as well, my bad. One of our users reported another minor issue: duplicate alt text badges. After applying this patch, they're gone. diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx
index a28ab26394..0920550cc6 100644
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@@ -113,10 +113,6 @@
badges.push(<NoAltTextBadge key='no-alt' />);
}
- if (description?.length > 0) {
- badges.push(<AltTextBadge key='alt' description={description} />);
- }
-
if (attachment.get('type') === 'unknown') {
return (
<div className={classNames('media-gallery__item', { standalone, 'media-gallery__item--tall': height === 100, 'media-gallery__item--wide': width === 100, 'media-missing-description': !hasMediaDescription })} key={attachment.get('id')}>Also, I can't express how grateful I am for the work you did with this PR, thank you! 🙏 |
|
Good catch, thanks! Removed the duplicate alt text badge. If you haven't seen any other issues, I think at this point the only two things remaining are:
|
f13d21b to
1c9a9fb
Compare
|
Pushed a fix for the backend part of quote local-only permissions. Just need to handle the UI. |
908d235 to
31e7e96
Compare
|
Got the UI! Pushed a fix that disables the federation dropdown and sets it to "local-only" if you start a quote of a local-only post. All we need now is the CSS, and we should be golden. |
31e7e96 to
65a3c2c
Compare
Co-authored-by: Jessica Stokes <[email protected]>
65a3c2c to
e50fe8b
Compare
|
Tested the recent changes of the local-only handling. They work, to some extent, by which I mean they work with the web interface. I tested this behaviour with the iOS app Ivory as well and quote toots of local-only toots were rejected with client error 422. On the one hand, this is nice, shows that the validation is working. On the other hand tho, Ivory doesn't know anything about local-only posts, which means there's nothing I can do within the app to get local-only quotes working. Not sure whether the API behaviour should be changed to silently change such posts to be local_only automatically, but it certainly would be a way to avoid this problem. ^^ |
|
Yeah, I'm not sure what a better experience would be with Ivory not knowing about local-only status... I feel like forcing the status to local-only would be confusing for the user too, who'd have no idea why their post didn't federate since they couldn't see that the quoted post was local-only to begin with. |
495ac0a to
6f9e149
Compare
|
Got some more CSS work in tonight, and mostly finished fairy-floss. Will finish up soon, then provide screenshots. Once I'm done I'll provide some screenshots so we can decide if anything else needs tweaking, then get on macaron. |
6f9e149 to
9e86850
Compare

This is a massive PR, so apologies for the poor performance viewing it!
This merges in the content of Mastodon 4.3.0. This PR isn't ready to deploy to production, and I don't recommend trying it in a production environment. Since I started by merging 4.3.0, this will likely have reverted at least some of the content of the post-4.3.0 security patches in the 4.2.x series; those will be brought back as I merge in 4.4.0 and 4.5.0.
I haven't yet tested this PR, so it may not actually run without additional tweaks. I'm putting it up now for discussion and so multiple people can test if we want.
Here's a few notes on things I ran into and thoughts I had while working on it:
server_banner.jsx,where I ended up undoing the v3-style rewrite due to the new react component being used. I'm not sure what the current goal for it is.status_action_barcorrectly.<Permalink>elements. I have in my notes thatstatus_contentmight need double-checking.status_content.media_itemdisplay, not all of which was preserved as-is due to surrounding rewrites. I'm not sure what the vision is and could use another set of eyes.