fix(files): show files uploaded by shared writers to folder owners (#19)
CD — Deployment / deploy (push) Successful in 19s

PR automatique de fix/folder-owner-file-visibility vers main.

---------

Co-authored-by: xEsiah <[email protected]>
Reviewed-on: #19
Reviewed-by: Esiah <[email protected]>
Co-authored-by: Gitea Actions <-[email protected]>
This commit was merged in pull request #19.
This commit is contained in:
Gitea Actions
2026-10-28 17:23:44 +00:00
committed by Esiah
co-authored by Esiah
parent 220ca62974
commit b52417053f
3 changed files with 20 additions and 5 deletions
+10 -2
View File
@@ -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({
+6 -2
View File
@@ -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({
+4 -1
View File
@@ -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({