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

Conflicts:
- `package.json`:
  Not really a conflict, just a glitch-soc-only dependency textually too close
  to an updated upstream one.
- `yarn.lock`:
  Not really a conflict, just a glitch-soc-only dependency textually too close
  to an updated upstream one.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/media_controller.rb
Simple merge

diff --cc app/models/media_attachment.rb
Simple merge

diff --cc package.json
index 0013e1530e53dcb1f8a012651bd80f0832a8a4e7,01f55cc3d773adf5e08e049900fc4af7d13512d9..36631d743c047742f4aa3857031107da0ae69ce0
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -71,11 -70,10 +71,11 @@@
      "@gamestdio/websocket": "^0.3.2",
      "@github/webauthn-json": "^0.5.7",
      "@rails/ujs": "^6.1.4",
-     "array-includes": "^3.1.3",
+     "array-includes": "^3.1.4",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
-     "autoprefixer": "^9.8.7",
-     "axios": "^0.21.4",
+     "autoprefixer": "^9.8.8",
+     "axios": "^0.22.0",
      "babel-loader": "^8.2.2",
      "babel-plugin-lodash": "^3.3.4",
      "babel-plugin-preval": "^5.0.0",

diff --cc streaming/index.js
Simple merge

diff --cc yarn.lock
index b99b6c6ec3dd7766c0a5482b524d71a1e4305055,1bd9ee9b4b6345b2e2f37dff565a5ced2f46c103..27d12c413c33174ff053492063d7e5514b2c667f
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -2300,15 -2261,10 +2261,15 @@@ atob@^2.1.2
    resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
    integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
  
- autoprefixer@^9.8.7:
-   version "9.8.7"
-   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.7.tgz#e3c12de18a800af1a1a8155fbc01dc7de29ea184"
-   integrity sha512-7Hg99B1eTH5+LgmUBUSmov1Z3bsggQJS7v3IMGo6wcScnbRuvtMc871J9J+4bSbIqa9LSX/zypFXJ8sXHpMJeQ==
 +atrament@0.2.4:
 +  version "0.2.4"
 +  resolved "https://registry.yarnpkg.com/atrament/-/atrament-0.2.4.tgz#6f78196edfcd194e568b7c0b9c88201ec371ac66"
 +  integrity sha512-hSA9VwW6COMwvRhSEO4uZweZ91YGOdHqwvslNyrJZG+8mzc4qx/qMsDZBuAeXFeWZO/QKtRjIXguOUy1aNMl3A==
 +
+ autoprefixer@^9.8.8:
+   version "9.8.8"
+   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.8.tgz#fd4bd4595385fa6f06599de749a4d5f7a474957a"
+   integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==
    dependencies:
      browserslist "^4.12.0"
      caniuse-lite "^1.0.30001109"