fix: conform moved code to eslint indent/quotes, 4-arg mutation callbacks

- eslint --fix on branch-changed backend files (indent shift from the
  module-wrapper nesting in decomposed files); backend lint now 904
  errors vs 1,315 on main
- useMutationWithToast forwards all four TanStack v5 callback args
  (tsc -b strict build flagged the 3-arg passthrough)
This commit is contained in:
Paul Nothaft
2026-07-03 08:17:14 +02:00
parent b5eafc52bd
commit 2ea26a4962
25 changed files with 2272 additions and 2272 deletions
@@ -265,7 +265,7 @@ class SecureImageMiddleware {
'X-Frame-Options': 'DENY', 'X-Frame-Options': 'DENY',
'X-XSS-Protection': '1; mode=block', 'X-XSS-Protection': '1; mode=block',
'Referrer-Policy': 'strict-origin-when-cross-origin', 'Referrer-Policy': 'strict-origin-when-cross-origin',
'Content-Security-Policy': "default-src 'none'; img-src 'self'", 'Content-Security-Policy': 'default-src \'none\'; img-src \'self\'',
// Custom security headers // Custom security headers
'X-Protected-Content': 'true', 'X-Protected-Content': 'true',
+1 -1
View File
@@ -44,7 +44,7 @@ function secureStatic(basePath, options = {}) {
// `default-src 'none'` already implies script-src 'none'; // `default-src 'none'` already implies script-src 'none';
// style-src + img-src(data:) keep normal SVG rendering working. // style-src + img-src(data:) keep normal SVG rendering working.
if (/\.svg$/i.test(filePath)) { if (/\.svg$/i.test(filePath)) {
resp.setHeader('Content-Security-Policy', "default-src 'none'; style-src 'unsafe-inline'; img-src 'self' data:"); resp.setHeader('Content-Security-Policy', 'default-src \'none\'; style-src \'unsafe-inline\'; img-src \'self\' data:');
resp.setHeader('X-Content-Type-Options', 'nosniff'); resp.setHeader('X-Content-Type-Options', 'nosniff');
} }
} }
+5 -5
View File
@@ -74,10 +74,10 @@ router.get(
'gallery_guests.created_at', 'gallery_guests.created_at',
'gallery_guests.last_seen_at', 'gallery_guests.last_seen_at',
'gallery_guests.email_verified_at', 'gallery_guests.email_verified_at',
db.raw("COUNT(CASE WHEN photo_feedback.feedback_type = 'like' THEN 1 END) AS likes"), db.raw('COUNT(CASE WHEN photo_feedback.feedback_type = \'like\' THEN 1 END) AS likes'),
db.raw("COUNT(CASE WHEN photo_feedback.feedback_type = 'favorite' THEN 1 END) AS favorites"), db.raw('COUNT(CASE WHEN photo_feedback.feedback_type = \'favorite\' THEN 1 END) AS favorites'),
db.raw("COUNT(CASE WHEN photo_feedback.feedback_type = 'comment' THEN 1 END) AS comments"), db.raw('COUNT(CASE WHEN photo_feedback.feedback_type = \'comment\' THEN 1 END) AS comments'),
db.raw("COUNT(CASE WHEN photo_feedback.feedback_type = 'rating' THEN 1 END) AS ratings"), db.raw('COUNT(CASE WHEN photo_feedback.feedback_type = \'rating\' THEN 1 END) AS ratings'),
db.raw('COUNT(DISTINCT photo_feedback.photo_id) AS distinct_photos') db.raw('COUNT(DISTINCT photo_feedback.photo_id) AS distinct_photos')
) )
.orderBy('gallery_guests.created_at', 'desc'); .orderBy('gallery_guests.created_at', 'desc');
@@ -117,7 +117,7 @@ router.get(
const photos = await db('photos') const photos = await db('photos')
.leftJoin('photo_feedback', function () { .leftJoin('photo_feedback', function () {
this.on('photo_feedback.photo_id', '=', 'photos.id') this.on('photo_feedback.photo_id', '=', 'photos.id')
.andOn(db.raw("photo_feedback.feedback_type IN ('like','favorite')")) .andOn(db.raw('photo_feedback.feedback_type IN (\'like\',\'favorite\')'))
.andOnNotNull('photo_feedback.guest_id'); .andOnNotNull('photo_feedback.guest_id');
}) })
.where('photos.event_id', eventId) .where('photos.event_id', eventId)
+1 -1
View File
@@ -1251,7 +1251,7 @@ router.post('/:eventId/chunked-upload/init', adminAuth, requirePermission('photo
// Validate file size (max 10GB) // Validate file size (max 10GB)
const maxSize = 10 * 1024 * 1024 * 1024; const maxSize = 10 * 1024 * 1024 * 1024;
if (fileSize > maxSize) { if (fileSize > maxSize) {
return res.status(400).json({ error: `File too large. Maximum size is 10GB.` }); return res.status(400).json({ error: 'File too large. Maximum size is 10GB.' });
} }
const result = await chunkedUpload.initializeUpload({ const result = await chunkedUpload.initializeUpload({
+6 -6
View File
@@ -308,7 +308,7 @@ class RestoreService {
this.log('info', 'Post-restore migrations applied'); this.log('info', 'Post-restore migrations applied');
} catch (migErr) { } catch (migErr) {
this.log('warn', this.log('warn',
`Post-restore migrate:safe failed — restore data is in place but the schema may lag the running image. ` + 'Post-restore migrate:safe failed — restore data is in place but the schema may lag the running image. ' +
`A container restart will retry via wait-for-db.sh. Error: ${migErr.message}`); `A container restart will retry via wait-for-db.sh. Error: ${migErr.message}`);
} }
@@ -888,9 +888,9 @@ class RestoreService {
throw new Error( throw new Error(
`Database backup file not found. Tried: ${candidates.join(', ')}. ` + `Database backup file not found. Tried: ${candidates.join(', ')}. ` +
`Manifest recorded path: ${dbBackupFile}. ` + `Manifest recorded path: ${dbBackupFile}. ` +
`Hint: this usually means the manifest's database.backup_file path no longer ` + 'Hint: this usually means the manifest\'s database.backup_file path no longer ' +
`exists on disk (deleted? moved? volume not mounted?). Check ` + 'exists on disk (deleted? moved? volume not mounted?). Check ' +
`~/<your-compose-dir>/backup/database/ on the host.` '~/<your-compose-dir>/backup/database/ on the host.'
); );
} }
@@ -1043,8 +1043,8 @@ class RestoreService {
await spawnAsync('psql', [ await spawnAsync('psql', [
'-h', host, '-p', String(port), '-U', user, '-d', maintenanceDb, '-h', host, '-p', String(port), '-U', user, '-d', maintenanceDb,
'-c', '-c',
`SELECT pg_terminate_backend(pid) FROM pg_stat_activity ` + 'SELECT pg_terminate_backend(pid) FROM pg_stat_activity ' +
`WHERE datname = '${database.replace(/'/g, "''")}' AND pid <> pg_backend_pid()`, `WHERE datname = '${database.replace(/'/g, '\'\'')}' AND pid <> pg_backend_pid()`,
], { env }); ], { env });
// Drop and recreate database (extremely dangerous!) // Drop and recreate database (extremely dangerous!)
+1 -1
View File
@@ -638,7 +638,7 @@ class S3StorageAdapter extends stream.EventEmitter {
UploadId: uploadId UploadId: uploadId
})); }));
} catch (abortError) { } catch (abortError) {
logger.error(`Failed to abort multipart upload:`, abortError); logger.error('Failed to abort multipart upload:', abortError);
} }
throw error; throw error;
+4 -4
View File
@@ -47,7 +47,7 @@ export function useMutationWithToast<
return useMutation<TData, TError, TVariables, TContext>({ return useMutation<TData, TError, TVariables, TContext>({
...mutationOptions, ...mutationOptions,
onSuccess: (data, variables, context) => { onSuccess: (data, variables, onMutateResult, context) => {
invalidateKeys?.forEach((queryKey) => { invalidateKeys?.forEach((queryKey) => {
queryClient.invalidateQueries({ queryKey }); queryClient.invalidateQueries({ queryKey });
}); });
@@ -56,9 +56,9 @@ export function useMutationWithToast<
typeof successMessage === 'function' ? successMessage(data, variables) : successMessage typeof successMessage === 'function' ? successMessage(data, variables) : successMessage
); );
} }
onSuccess?.(data, variables, context); onSuccess?.(data, variables, onMutateResult, context);
}, },
onError: (error, variables, context) => { onError: (error, variables, onMutateResult, context) => {
const message = const message =
typeof errorMessage === 'function' typeof errorMessage === 'function'
? errorMessage(error) ? errorMessage(error)
@@ -67,7 +67,7 @@ export function useMutationWithToast<
(error instanceof Error ? error.message : undefined) || (error instanceof Error ? error.message : undefined) ||
'An unexpected error occurred'; 'An unexpected error occurred';
toast.error(message); toast.error(message);
onError?.(error, variables, context); onError?.(error, variables, onMutateResult, context);
}, },
}); });
} }