diff options
| author | nenohi <kimutipartylove@gmail.com> | 2023-11-21 19:50:06 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 19:50:06 +0900 |
| commit | 481bca4cf2e8f13a46654770291b7ee31a1c361e (patch) | |
| tree | 877118de39396ec8ce5e2b56b1e20e47f55407e6 /packages/backend/src/server | |
| parent | サーバ起動時にアンテナが非アクティブだった場合、ア... (diff) | |
| download | sharkey-481bca4cf2e8f13a46654770291b7ee31a1c361e.tar.gz sharkey-481bca4cf2e8f13a46654770291b7ee31a1c361e.tar.bz2 sharkey-481bca4cf2e8f13a46654770291b7ee31a1c361e.zip | |
広告掲載ページにてfilterをわかりやすく (#12385)
Diffstat (limited to 'packages/backend/src/server')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/admin/ad/list.ts | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/backend/src/server/api/endpoints/admin/ad/list.ts b/packages/backend/src/server/api/endpoints/admin/ad/list.ts index 29eff89523..1366fbf76a 100644 --- a/packages/backend/src/server/api/endpoints/admin/ad/list.ts +++ b/packages/backend/src/server/api/endpoints/admin/ad/list.ts @@ -22,7 +22,7 @@ export const paramDef = { limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, sinceId: { type: 'string', format: 'misskey:id' }, untilId: { type: 'string', format: 'misskey:id' }, - publishing: { type: 'boolean', default: false }, + publishing: { type: 'boolean', default: null, nullable: true}, }, required: [], } as const; @@ -37,8 +37,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- ) { super(meta, paramDef, async (ps, me) => { const query = this.queryService.makePaginationQuery(this.adsRepository.createQueryBuilder('ad'), ps.sinceId, ps.untilId); - if (ps.publishing) { + if (ps.publishing === true) { query.andWhere('ad.expiresAt > :now', { now: new Date() }).andWhere('ad.startsAt <= :now', { now: new Date() }); + } else if (ps.publishing === false) { + query.andWhere('ad.expiresAt <= :now', { now: new Date() }).orWhere('ad.startsAt > :now', { now: new Date() }); } const ads = await query.limit(ps.limit).getMany(); |