Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.

app/javascript/styles/mastodon/components.scss

@@ -1155,6 +1155,7 @@ body > [data-popper-placement] {
     .video-player,
     .audio-player,
     .attachment-list,
+    .picture-in-picture-placeholder,
     .status-card {
       margin-inline-start: 46px + 10px;
       width: calc(100% - (46px + 10px));
@@ -6522,6 +6523,7 @@ a.status-card.compact:hover {
   background: darken($ui-base-color, 8%);
   border-radius: 4px;
   padding-bottom: 44px;
+  width: 100%;
 
   &.editable {
     border-radius: 0;

app/javascript/styles/mastodon/forms.scss

@@ -722,7 +722,7 @@ code {
     }
   }
 
-  @media screen and (width <= 740px) and (width >= 441px) {
+  @media screen and (440px < width <= 740px) {
     margin-top: 40px;
   }