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

Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.

streaming/eslint.config.mjs

@@ -1,5 +1,7 @@
 // @ts-check
 
+import path from 'node:path';
+
 import globals from 'globals';
 import tseslint from 'typescript-eslint';
 
@@ -20,7 +22,9 @@ export default tseslint.config([
     settings: {
       'import/ignore': ['node_modules', '\\.(json)$'],
       'import/resolver': {
-        typescript: {},
+        typescript: {
+          project: path.resolve(import.meta.dirname, './tsconfig.json'),
+        },
       },
     },