Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream

Conflicts:
- `app/services/backup_service.rb`:
  Upstream refactored activity serialization while glitch-soc passed an extra argument.
  Followed upstream's refactor, keeping our extra argument.

streaming/package.json

@@ -21,7 +21,7 @@
     "dotenv": "^17.0.0",
     "express": "^5.1.0",
     "ioredis": "^5.3.2",
-    "jsdom": "^27.0.0",
+    "jsdom": "^28.0.0",
     "pg": "^8.5.0",
     "pg-connection-string": "^2.6.0",
     "pino": "^10.0.0",