diff options
| author | Mar0xy <marie@kaifa.ch> | 2023-10-16 23:38:21 +0200 |
|---|---|---|
| committer | Mar0xy <marie@kaifa.ch> | 2023-10-16 23:38:21 +0200 |
| commit | 68886b9ab5fc1cf50033b382b85e0a068fdbb7d6 (patch) | |
| tree | 33dda5f8a6be49b148c49eafdcea8cdd9ded4b7a /packages/backend/src/server/api/endpoints/drive | |
| parent | up: dev version (diff) | |
| parent | update deps (diff) | |
| download | sharkey-68886b9ab5fc1cf50033b382b85e0a068fdbb7d6.tar.gz sharkey-68886b9ab5fc1cf50033b382b85e0a068fdbb7d6.tar.bz2 sharkey-68886b9ab5fc1cf50033b382b85e0a068fdbb7d6.zip | |
merge: upstream performance changes & instance silencing
Diffstat (limited to 'packages/backend/src/server/api/endpoints/drive')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/drive/files.ts | 4 | ||||
| -rw-r--r-- | packages/backend/src/server/api/endpoints/drive/folders/create.ts | 3 |
2 files changed, 3 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 6f3a62977f..b7e9d12e94 100644 --- a/packages/backend/src/server/api/endpoints/drive/files.ts +++ b/packages/backend/src/server/api/endpoints/drive/files.ts @@ -69,8 +69,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- } switch (ps.sort) { - case '+createdAt': query.orderBy('file.createdAt', 'DESC'); break; - case '-createdAt': query.orderBy('file.createdAt', 'ASC'); break; + case '+createdAt': query.orderBy('file.id', 'DESC'); break; + case '-createdAt': query.orderBy('file.id', 'ASC'); break; case '+name': query.orderBy('file.name', 'DESC'); break; case '-name': query.orderBy('file.name', 'ASC'); break; case '+size': query.orderBy('file.size', 'DESC'); break; diff --git a/packages/backend/src/server/api/endpoints/drive/folders/create.ts b/packages/backend/src/server/api/endpoints/drive/folders/create.ts index bc3a9bbe21..d18199f19b 100644 --- a/packages/backend/src/server/api/endpoints/drive/folders/create.ts +++ b/packages/backend/src/server/api/endpoints/drive/folders/create.ts @@ -76,8 +76,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- // Create folder const folder = await this.driveFoldersRepository.insert({ - id: this.idService.genId(), - createdAt: new Date(), + id: this.idService.gen(), name: ps.name, parentId: parent !== null ? parent.id : null, userId: me.id, |