diff options
| author | Marie <marie@kaifa.ch> | 2024-01-15 12:07:35 +0100 |
|---|---|---|
| committer | Marie <marie@kaifa.ch> | 2024-01-15 12:07:35 +0100 |
| commit | 4c1f6be735301e969030bc2ecf3588621145f852 (patch) | |
| tree | b2d4d82a3892f088222b169372ecb736ab6730bc /packages/backend/src/server/api/endpoints/drive | |
| parent | merge: correct some japanese translations (#350) (diff) | |
| parent | enhance: 動画・音声周りのUIと動作改良 (#12925) (diff) | |
| download | sharkey-4c1f6be735301e969030bc2ecf3588621145f852.tar.gz sharkey-4c1f6be735301e969030bc2ecf3588621145f852.tar.bz2 sharkey-4c1f6be735301e969030bc2ecf3588621145f852.zip | |
merge: upstream
Diffstat (limited to 'packages/backend/src/server/api/endpoints/drive')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/drive/files.ts | 2 | ||||
| -rw-r--r-- | packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/server/api/endpoints/drive/files.ts b/packages/backend/src/server/api/endpoints/drive/files.ts index b7e9d12e94..0ca31dc993 100644 --- a/packages/backend/src/server/api/endpoints/drive/files.ts +++ b/packages/backend/src/server/api/endpoints/drive/files.ts @@ -36,7 +36,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, folderId: { type: 'string', format: 'misskey:id', nullable: true, default: null }, 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'] }, + sort: { type: 'string', nullable: true, enum: ['+createdAt', '-createdAt', '+name', '-name', '+size', '-size', null] }, }, required: [], } as const; diff --git a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts index 14a13b09c9..7a0b8b4417 100644 --- a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts +++ b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts @@ -74,7 +74,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- } const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId); - query.andWhere(':file = ANY(note.fileIds)', { file: file.id }); + query.andWhere(':file <@ note.fileIds', { file: [file.id] }); const notes = await query.limit(ps.limit).getMany(); |