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.
This commit is contained in:
Claire
2021-10-13 15:50:24 +02:00
11 changed files with 331 additions and 370 deletions

View File

@ -431,7 +431,7 @@ const startWorker = (workerId) => {
requiredScopes.push('read:statuses');
}
if (requiredScopes.some(requiredScope => req.scopes.includes(requiredScope))) {
if (req.scopes && requiredScopes.some(requiredScope => req.scopes.includes(requiredScope))) {
resolve();
return;
}