From ecc682dc181fda104043c2382454da68e7723387 Mon Sep 17 00:00:00 2001 From: xEsiah Date: Wed, 28 Oct 2026 18:17:57 +0100 Subject: [PATCH] fix(files): show files uploaded by shared writers to folder owners --- backend/src/routes/files.ts | 12 ++++++++++-- backend/src/routes/media.ts | 8 ++++++-- backend/src/routes/search.ts | 5 ++++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/backend/src/routes/files.ts b/backend/src/routes/files.ts index 170b461..103d63e 100644 --- a/backend/src/routes/files.ts +++ b/backend/src/routes/files.ts @@ -414,6 +414,10 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => { OR ( f.folder_id IS NOT NULL AND EXISTS ( SELECT 1 FROM folders f2 WHERE f2.id = f.folder_id AND f2.access_type = 'public' ) ) + OR ( f.folder_id IS NOT NULL + AND EXISTS ( SELECT 1 FROM folders f3 + WHERE f3.id = f.folder_id + AND f3.owner_id = ? ) ) OR ( f.folder_id IS NOT NULL AND EXISTS ( SELECT 1 FROM folder_permissions fp WHERE fp.folder_id = f.folder_id @@ -422,7 +426,7 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => { AND ( fp.expires_at IS NULL OR fp.expires_at > UTC_TIMESTAMP() ) ) ) ) ORDER BY is_starred DESC, f.name`, - [user.id, folderId, 0, user.id, user.id], + [user.id, folderId, 0, user.id, user.id, user.id], ); return context.json({ folderId, files: rows.map(publicFile) }); @@ -449,6 +453,10 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => { AND EXISTS ( SELECT 1 FROM folders f WHERE f.id = fi.folder_id AND f.deleted_at IS NULL AND f.access_type = 'public' ) ) + OR ( fi.folder_id IS NOT NULL + AND EXISTS ( SELECT 1 FROM folders f + WHERE f.id = fi.folder_id AND f.deleted_at IS NULL + AND f.owner_id = ? ) ) OR ( fi.folder_id IS NOT NULL AND EXISTS ( SELECT 1 FROM folder_permissions fp WHERE fp.folder_id = fi.folder_id AND fp.user_id = ? @@ -456,7 +464,7 @@ export const registerFileRoutes = (app: App, db: Db, config: Config): void => { AND ( fp.expires_at IS NULL OR fp.expires_at > UTC_TIMESTAMP() ) ) ) ) ORDER BY ufs.created_at DESC`, - [user.id, user.id, user.id], + [user.id, user.id, user.id, user.id], ); return context.json({ diff --git a/backend/src/routes/media.ts b/backend/src/routes/media.ts index 271bf1c..557a54e 100644 --- a/backend/src/routes/media.ts +++ b/backend/src/routes/media.ts @@ -55,14 +55,18 @@ export const registerMediaRoutes = (app: App, db: Db): void => { OR ( fi.folder_id IS NOT NULL AND EXISTS ( SELECT 1 FROM folders f WHERE f.id = fi.folder_id AND f.access_type = 'public' ) ) + OR ( fi.folder_id IS NOT NULL + AND EXISTS ( SELECT 1 FROM folders f2 + WHERE f2.id = fi.folder_id AND f2.owner_id = ? ) ) OR ( fi.folder_id IS NOT NULL AND EXISTS ( SELECT 1 FROM folder_permissions fp WHERE fp.folder_id = fi.folder_id AND fp.user_id = ? AND fp.level IN ('read', 'write', 'admin') - AND ( fp.expires_at IS NULL OR fp.expires_at > UTC_TIMESTAMP() ) ) ) ) + AND ( fp.expires_at IS NULL + OR fp.expires_at > UTC_TIMESTAMP() ) ) ) ) ORDER BY fi.created_at DESC LIMIT ${limit} OFFSET ${offset}`, - [user.id, kind, kind, 0, user.id, user.id], + [user.id, kind, kind, 0, user.id, user.id, user.id], ); return context.json({ diff --git a/backend/src/routes/search.ts b/backend/src/routes/search.ts index aa95be9..882a758 100644 --- a/backend/src/routes/search.ts +++ b/backend/src/routes/search.ts @@ -75,13 +75,16 @@ export const registerSearchRoutes = (app: App, db: Db): void => { OR ( fi.folder_id IS NOT NULL AND EXISTS ( SELECT 1 FROM folders f WHERE f.id = fi.folder_id AND f.access_type = 'public' ) ) + OR ( fi.folder_id IS NOT NULL + AND EXISTS ( SELECT 1 FROM folders f2 + WHERE f2.id = fi.folder_id AND f2.owner_id = ? ) ) OR ( fi.folder_id IS NOT NULL AND EXISTS ( SELECT 1 FROM folder_permissions fp WHERE fp.folder_id = fi.folder_id AND fp.user_id = ? AND ( fp.expires_at IS NULL OR fp.expires_at > UTC_TIMESTAMP() ) ) ) ) ORDER BY fi.name LIMIT ${LIMIT}`, - [user.id, pattern, 0, user.id, user.id], + [user.id, pattern, 0, user.id, user.id, user.id], ); return context.json({