Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict due to glitch-soc having extra code for a proper direct visibility
  timeline, in a part of the code upstream refactored.
  Restored glitch-soc's extra code in the refactored bit.

package.json

@@ -39,7 +39,7 @@
     "@babel/runtime": "^7.17.9",
     "@gamestdio/websocket": "^0.3.2",
     "@github/webauthn-json": "^0.5.7",
-    "@rails/ujs": "^6.1.5",
+    "@rails/ujs": "^6.1.6",
     "array-includes": "^3.1.5",
     "atrament": "0.2.4",
     "arrow-key-navigation": "^1.2.0",