summaryrefslogtreecommitdiff
path: root/packages/backend/src/server
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-05-07 17:14:41 +0000
committerHazelnoot <acomputerdog@gmail.com>2025-05-07 17:14:41 +0000
commitb66a486036875185e5ee1c98b6ea585dc30951d1 (patch)
tree62b8e5b4d113a22196e1bca71bcaae039634995b /packages/backend/src/server
parentmerge: add logo text source and instructions (!983) (diff)
parentup (diff)
downloadsharkey-b66a486036875185e5ee1c98b6ea585dc30951d1.tar.gz
sharkey-b66a486036875185e5ee1c98b6ea585dc30951d1.tar.bz2
sharkey-b66a486036875185e5ee1c98b6ea585dc30951d1.zip
merge: Show all files for Drive Cleaner (!982)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/982 Closes #1033 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Hazelnoot <acomputerdog@gmail.com>
Diffstat (limited to 'packages/backend/src/server')
-rw-r--r--packages/backend/src/server/api/endpoints/drive/files.ts11
1 files changed, 7 insertions, 4 deletions
diff --git a/packages/backend/src/server/api/endpoints/drive/files.ts b/packages/backend/src/server/api/endpoints/drive/files.ts
index 5df212415d..26b7b32001 100644
--- a/packages/backend/src/server/api/endpoints/drive/files.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files.ts
@@ -46,6 +46,7 @@ export const paramDef = {
type: { type: 'string', nullable: true, pattern: /^[a-zA-Z\/\-*]+$/.toString().slice(1, -1) },
sort: { type: 'string', nullable: true, enum: ['+createdAt', '-createdAt', '+name', '-name', '+size', '-size', null] },
searchQuery: { type: 'string', default: '' },
+ showAll: { type: 'boolean', default: false },
},
required: [],
} as const;
@@ -63,10 +64,12 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
const query = this.queryService.makePaginationQuery(this.driveFilesRepository.createQueryBuilder('file'), ps.sinceId, ps.untilId)
.andWhere('file.userId = :userId', { userId: me.id });
- if (ps.folderId) {
- query.andWhere('file.folderId = :folderId', { folderId: ps.folderId });
- } else {
- query.andWhere('file.folderId IS NULL');
+ if (!ps.showAll) {
+ if (ps.folderId) {
+ query.andWhere('file.folderId = :folderId', { folderId: ps.folderId });
+ } else {
+ query.andWhere('file.folderId IS NULL');
+ }
}
if (ps.searchQuery.length > 0) {