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

Conflicts:
- streaming/index.js

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc streaming/index.js
index 55ecc3ba342f12101818509349767690f8b85c2a,639867b28c691148d25a3f30e4f06ca1e9ce7aa8..10df210a3dd5792ec4df33415f548f92916033ff
--- 1/streaming/index.js
--- 2/streaming/index.js
+++ b/streaming/index.js
@@@ -339,12 -371,10 +371,16 @@@ const startWorker = (workerId) => 
          return;
        }
  
+       if (event === 'notification' && !req.allowNotifications) {
+         return;
+       }
+ 
 +      // Only send local-only statuses to logged-in users
 +      if (payload.local_only && !req.accountId) {
 +        log.silly(req.requestId, `Message ${payload.id} filtered because it was local-only`);
 +        return;
 +      }
 +
        // Only messages that may require filtering are statuses, since notifications
        // are already personalized and deletes do not matter
        if (!needsFiltering || event !== 'update') {