I have coded a patch for Mastodon that should be double checked before I can put it in production on my end.

If someone is into Mastodon development and can have a look, it would be of great help: https://github.com/tootsuite/mastodon/pull/12229

Do break it apart and let me know what I am doing wrong :)