Merge vanilla updates into glitch - round 2

[chriswmartin]

Keeping us up to date!

PRs included: mastodon#5913, mastodon#5931, mastodon#6105, mastodon#6106, mastodon#6158, mastodon#6163, mastodon#6184, mastodon#6223

as well as 0d4dcb5 which is a continuation of PRs mastodon#6046, mastodon#6098, and mastodon#6105

[hannahwhy]

Thanks!

Out of curiosity, do you have programs that e.g. take a diff, rewrite the paths, and re-apply the diff? If so, would you be willing to provide them to glitch-soc? It'd mean that we could spread the workload of keeping the glitch flavour up-to-date with frontend changes.

[hannahwhy]

I've checked over the individual commits and it looks like they carry across the changes correctly, so this works for me. If there's bugs we'll know soon enough :P

[chriswmartin]

@yipdw I've been doing all of the merging manually -- a program would be pretty helpful though so maybe I'll try to put something together when I have more time!