Add strikethrough support for s tag

Merge tag 'v4.2.10' into hometown-4.2-merge

Merge upstream changes from v4.0.15 (#1344)

This includes the security content of Mastodon 4.0.15/4.2.7.
https://github.com/mastodon/mastodon/releases/tag/v4.2.7

---------

Co-authored-by: Claire <[email protected]>
Co-authored-by: Matt Jankowski <[email protected]>

Merge tag 'v3.5.19' into hometown-1.0.8-security

Upstream backports (#1343)

This backports the commits from the upstream `stable-4.0` branch,
including the security content of
[4.2.6](https://github.com/mastodon/mastodon/releases/tag/v4.2.6).

---------

Co-authored-by: blah <blah@blah>
Co-authored-by: Emelia Smith <[email protected]>
Co-authored-by: Claire <[email protected]>

Merge security fixes of mastodon v4.0.13 (#1340)

There were some smaller merge conflicts (e.g. in `lib/version.rb`), but
all of them were of smaller nature. Due to the fact that other v4.0.*
versions are also included, it's a bit bigger than the other PR for 3.5.

I won't repeat the changelog here, the upgrade is the usual *git pull
and restart all mastodon processes*.

---------

Co-authored-by: Michael Stanclift <[email protected]>
Co-authored-by: Claire <[email protected]>
Co-authored-by: Eugen Rochko <[email protected]>
Co-authored-by: Emelia Smith <[email protected]>
Co-authored-by: Renaud Chaput <[email protected]>
Co-authored-by: Daniel M Brasil <[email protected]>
Co-authored-by: yufushiro <[email protected]>
Co-authored-by: Nicolai Søborg <[email protected]>
Co-authored-by: Essem <[email protected]>
Co-authored-by: Jakob Gillich <[email protected]>
Co-authored-by: David Aaron <[email protected]>
Co-authored-by: Matt Jankowski <[email protected]>

Merge security fixes of v3.5.17 (#1341)

_todo_

---------

Co-authored-by: Claire <[email protected]>
Co-authored-by: Essem <[email protected]>
Co-authored-by: Jakob Gillich <[email protected]>
Co-authored-by: David Aaron <[email protected]>
Co-authored-by: Matt Jankowski <[email protected]>
Co-authored-by: Jonathan de Jong <[email protected]>

Merge changes of 4.0.7..4.0.10 (#1324)

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:

```js
      // 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.

---------

Co-authored-by: Michael Stanclift <[email protected]>
Co-authored-by: Claire <[email protected]>
Co-authored-by: Eugen Rochko <[email protected]>
Co-authored-by: Emelia Smith <[email protected]>
Co-authored-by: Renaud Chaput <[email protected]>
Co-authored-by: Daniel M Brasil <[email protected]>
Co-authored-by: yufushiro <[email protected]>
Co-authored-by: Nicolai Søborg <[email protected]>

Merge tag 'v3.5.14' into hometown-3.5.14-merge

Merge tag 'v3.5.10' into hometown-3.5.10-merge