広告に関する修正(配信中の絞り込み、Create時にMiAdを返すように) (#11913)

* ad/createにて作成したMiAdを返すように

別なツールからアップデート等をする際に必要

* ad/list取得に現在掲載中のオプションを作成

* スイッチで配信中のみを絞れるように

* update CHANGELOG

* エラー修正

* Update packages/frontend/src/pages/admin/ads.vue

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

2 files changed, 7 insertions, 2 deletions

diff --git a/packages/backend/src/server/api/endpoints/admin/ad/create.ts b/packages/backend/src/server/api/endpoints/admin/ad/create.ts
index a13d08fd3a..2ed9410e78 100644
--- a/packages/backend/src/server/api/endpoints/admin/ad/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/ad/create.ts
@@ -41,7 +41,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private idService: IdService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			await this.adsRepository.insert({
+			const ad = await this.adsRepository.insert({
 				id: this.idService.genId(),
 				createdAt: new Date(),
 				expiresAt: new Date(ps.expiresAt),
@@ -53,7 +53,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				ratio: ps.ratio,
 				place: ps.place,
 				memo: ps.memo,
-			});
+			}).then(r => this.adsRepository.findOneByOrFail({ id: r.identifiers[0].id }));
+			return ad;
 		});
 	}
 }
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 adff3ed0ae..29eff89523 100644
--- a/packages/backend/src/server/api/endpoints/admin/ad/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/ad/list.ts
@@ -22,6 +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 },
 	},
 	required: [],
 } as const;
@@ -36,6 +37,9 @@ 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) {
+				query.andWhere('ad.expiresAt > :now', { now: new Date() }).andWhere('ad.startsAt <= :now', { now: new Date() });
+			}
 			const ads = await query.limit(ps.limit).getMany();
 
 			return ads;