diff --git a/CHANGELOG.md b/CHANGELOG.md index b5dea03e63d35f4e84f6e889d871c6ce532a94e6..64cfbbf9fcb263199e99919db199e44050a73e4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,9 +24,11 @@ ### Client - Enhance: モデレーションãƒã‚°æ©Ÿèƒ½ã®å¼·åŒ– - Enhance: Plugin:register_post_form_actionを用ã„ã¦CWã‚’å–得・変更ã§ãるよã†ã« +- Feat:admin/ad/listã«ã¦æŽ²è¼‰ä¸ã®åºƒå‘ŠãŒçµžã‚Šè¾¼ã‚るよã†ã« ### Server - Enhance: Masterプãƒã‚»ã‚¹ã®PIDを書ã出ã›ã‚‹ã‚ˆã†ã« +- Feat:admin/ad/createã«ã¦ãƒ¬ã‚¹ãƒãƒ³ã‚¹200ã€è¨å®šã—ãŸåºƒå‘Šæƒ…å ±ã‚’è¿”ã™ã‚ˆã†ã« ## 2023.9.1 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 a13d08fd3a2aeb883f2bdea6b8a9e54c0b16890d..2ed9410e789e90bc3c48c8b7bbac14674439fd6d 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 adff3ed0ae6481871dfffd6a2d9a025f36c656d3..29eff89523349d0c7875e0183667155eb278ac11 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; diff --git a/packages/frontend/src/pages/admin/ads.vue b/packages/frontend/src/pages/admin/ads.vue index cd9d86ca4536f592a44814cb2c77f994203ea04b..6aa0cf0427818f93c43865532b6fcea037d4eba6 100644 --- a/packages/frontend/src/pages/admin/ads.vue +++ b/packages/frontend/src/pages/admin/ads.vue @@ -5,11 +5,16 @@ SPDX-License-Identifier: AGPL-3.0-only <template> <MkStickyContainer> - <template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template> + <template #header> + <XHeader :actions="headerActions" :tabs="headerTabs" /> + </template> <MkSpacer :contentMax="900"> + <MkSwitch :modelValue="publishing" @update:modelValue="onChangePublishing"> + {{ i18n.ts.publishing }} + </MkSwitch> <div> <div v-for="ad in ads" class="_panel _gaps_m" :class="$style.ad"> - <MkAd v-if="ad.url" :specify="ad"/> + <MkAd v-if="ad.url" :specify="ad" /> <MkInput v-model="ad.url" type="url"> <template #label>URL</template> </MkInput> @@ -46,7 +51,8 @@ SPDX-License-Identifier: AGPL-3.0-only <span> {{ i18n.ts._ad.timezoneinfo }} <div v-for="(day, index) in daysOfWeek" :key="index"> - <input :id="`ad${ad.id}-${index}`" type="checkbox" :checked="(ad.dayOfWeek & (1 << index)) !== 0" @change="toggleDayOfWeek(ad, index)"> + <input :id="`ad${ad.id}-${index}`" type="checkbox" :checked="(ad.dayOfWeek & (1 << index)) !== 0" + @change="toggleDayOfWeek(ad, index)"> <label :for="`ad${ad.id}-${index}`">{{ day }}</label> </div> </span> @@ -55,8 +61,10 @@ SPDX-License-Identifier: AGPL-3.0-only <template #label>{{ i18n.ts.memo }}</template> </MkTextarea> <div class="buttons"> - <MkButton class="button" inline primary style="margin-right: 12px;" @click="save(ad)"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton> - <MkButton class="button" inline danger @click="remove(ad)"><i class="ti ti-trash"></i> {{ i18n.ts.remove }}</MkButton> + <MkButton class="button" inline primary style="margin-right: 12px;" @click="save(ad)"><i + class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton> + <MkButton class="button" inline danger @click="remove(ad)"><i class="ti ti-trash"></i> {{ i18n.ts.remove }} + </MkButton> </div> </div> <MkButton class="button" @click="more()"> @@ -75,6 +83,7 @@ import MkInput from '@/components/MkInput.vue'; import MkTextarea from '@/components/MkTextarea.vue'; import MkRadios from '@/components/MkRadios.vue'; import MkFolder from '@/components/MkFolder.vue'; +import MkSwitch from '@/components/MkSwitch.vue'; import FormSplit from '@/components/form/split.vue'; import * as os from '@/os.js'; import { i18n } from '@/i18n.js'; @@ -86,8 +95,9 @@ let ads: any[] = $ref([]); const localTime = new Date(); const localTimeDiff = localTime.getTimezoneOffset() * 60 * 1000; const daysOfWeek: string[] = [i18n.ts._weekday.sunday, i18n.ts._weekday.monday, i18n.ts._weekday.tuesday, i18n.ts._weekday.wednesday, i18n.ts._weekday.thursday, i18n.ts._weekday.friday, i18n.ts._weekday.saturday]; +let publishing = false; -os.api('admin/ad/list').then(adsResponse => { +os.api('admin/ad/list', { publishing: publishing }).then(adsResponse => { ads = adsResponse.map(r => { const exdate = new Date(r.expiresAt); const stdate = new Date(r.startsAt); @@ -101,6 +111,10 @@ os.api('admin/ad/list').then(adsResponse => { }); }); +const onChangePublishing = (v) => { + publishing = v; + refresh(); +}; // é¸æŠžã•ã‚ŒãŸæ›œæ—¥(index)ã®ãƒ“ットフラグをæ“作ã™ã‚‹ function toggleDayOfWeek(ad, index) { ad.dayOfWeek ^= 1 << index; @@ -131,6 +145,8 @@ function remove(ad) { if (ad.id == null) return; os.apiWithDialog('admin/ad/delete', { id: ad.id, + }).then(() => { + refresh(); }); }); } @@ -172,7 +188,7 @@ function save(ad) { } } function more() { - os.api('admin/ad/list', { untilId: ads.reduce((acc, ad) => ad.id != null ? ad : acc).id }).then(adsResponse => { + os.api('admin/ad/list', { untilId: ads.reduce((acc, ad) => ad.id != null ? ad : acc).id, publishing: publishing }).then(adsResponse => { ads = ads.concat(adsResponse.map(r => { const exdate = new Date(r.expiresAt); const stdate = new Date(r.startsAt); @@ -188,7 +204,7 @@ function more() { } function refresh() { - os.api('admin/ad/list').then(adsResponse => { + os.api('admin/ad/list', { publishing: publishing }).then(adsResponse => { ads = adsResponse.map(r => { const exdate = new Date(r.expiresAt); const stdate = new Date(r.startsAt);