Webhookの設定にお知らせの作成時を追加

locales/index.d.ts

@@ -9607,6 +9607,10 @@ export interface Locale extends ILocale {
              * 通報が自動解決されたとき
              */
             "reportAutoResolved": string;
+            /**
+             * お知らせが作成されたとき
+             */
+            "announceCreated": string;
         };
     };
     "_abuse": {

locales/ja-JP.yml

@@ -2542,6 +2542,7 @@ _webhookSettings:
     reportCreated: "通報が登録されたとき"
     reportResolved: "通報が解決されたとき"
     reportAutoResolved: "通報が自動解決されたとき"
+    announceCreated: "お知らせが作成されたとき"
 
 _abuse:
   _resolver:

packages/backend/src/models/Webhook.ts

@@ -7,7 +7,7 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typ
 import { id } from './util/id.js';
 import { MiUser } from './User.js';
 
-export const webhookEventTypes = ['mention', 'unfollow', 'follow', 'followed', 'note', 'reply', 'renote', 'reaction', 'reportCreated', 'reportResolved', 'reportAutoResolved'] as const;
+export const webhookEventTypes = ['mention', 'unfollow', 'follow', 'followed', 'note', 'reply', 'renote', 'reaction', 'reportCreated', 'reportResolved', 'reportAutoResolved', 'announceCreated'] as const;
 
 @Entity('webhook')
 export class MiWebhook {

packages/backend/src/queue/processors/AnnounceProcessorService.ts

@@ -0,0 +1,53 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Injectable, Inject } from '@nestjs/common';
+import { bindThis } from '@/decorators.js';
+import type Logger from '@/logger.js';
+import { RoleService } from '@/core/RoleService.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { InstanceActorService } from '@/core/InstanceActorService.js';
+import type { AnnouncementsRepository, UsersRepository } from '@/models/_.js';
+import { DI } from '@/di-symbols.js';
+import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
+import { QueueService } from '@/core/QueueService.js';
+import { WebhookService } from '@/core/WebhookService.js';
+import { QueueLoggerService } from '../QueueLoggerService.js';
+import type { DbAnnouncementJobData } from '../types.js';
+import type * as Bull from 'bullmq';
+
+@Injectable()
+export class AnnounceProcessorService {
+	private logger: Logger;
+	constructor(
+		@Inject(DI.announcementsRepository)
+		private announcementsRepository: AnnouncementsRepository,
+
+		private queueLoggerService: QueueLoggerService,
+		private roleService: RoleService,
+		private queueService: QueueService,
+		private webhookService: WebhookService,
+	) {
+		this.logger = this.queueLoggerService.logger.createSubLogger('announce');
+	}
+	@bindThis
+	public async process(job: Bull.Job<DbAnnouncementJobData>): Promise<void> {
+		this.logger.info('Running...');
+
+		const announce = await this.announcementsRepository.findOneByOrFail({
+			id: job.data.id,
+		});
+		const webhooks = (await this.webhookService.getActiveWebhooks()).filter(x => x.on.includes('announceCreated'));
+		for (const webhook of webhooks) {
+			if (await this.roleService.isAdministrator({ id: webhook.userId, isRoot: false })) {
+				this.queueService.webhookDeliver(webhook, 'announceCreated', {
+					resolver: announce,
+					announce: job.data,
+				});
+			}
+		}
+
+	}
+}

packages/backend/src/queue/types.ts

@@ -11,6 +11,7 @@ import type { MiAbuseUserReport } from '@/models/AbuseUserReport.js';
 import type { MiWebhook } from '@/models/Webhook.js';
 import type { IActivity } from '@/core/activitypub/type.js';
 import type httpSignature from '@peertube/http-signature';
+import { MiAnnouncement } from '@/models/Announcement.js';
 
 export type DeliverJobData = {
 	/** Actor */
@@ -102,6 +103,8 @@ export type DbUserImportToDbJobData = {
 
 export type DbAbuseReportJobData = MiAbuseUserReport;
 
+export type DbAnnouncementJobData = MiAnnouncement;
+
 export type ObjectStorageJobData = ObjectStorageFileJobData | Record<string, unknown>;
 
 export type ObjectStorageFileJobData = {

packages/backend/src/server/api/endpoints/admin/announcements/create.ts

@@ -6,6 +6,8 @@
 import { Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { AnnouncementService } from '@/core/AnnouncementService.js';
+import { QueueService } from '@/core/QueueService.js';
+import { WebhookService } from '@/core/WebhookService.js';
 
 export const meta = {
 	tags: ['admin'],
@@ -104,6 +106,8 @@
 export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
 	constructor(
 		private announcementService: AnnouncementService,
+		private queueService: QueueService,
+		private webhookService: WebhookService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const { raw, packed } = await this.announcementService.create({
@@ -120,7 +124,16 @@
 				silence: ps.silence,
 				userId: ps.userId,
 			}, me);
-
+			if(ps.userId === null) {
+				this.webhookService.getActiveWebhooks().then(webhooks => {
+					webhooks = webhooks.filter(x => x.on.includes('announceCreated'));
+					for (const webhook of webhooks) {
+						this.queueService.webhookDeliver(webhook, 'announceCreated', {
+							announcement: packed,
+						});
+					}
+				});
+			}
 			return packed;
 		});
 	}

packages/backend/src/server/api/endpoints/i/webhooks/create.ts

@@ -95,7 +95,7 @@
 				throw new ApiError(meta.errors.tooManyWebhooks);
 			}
 
-			if (ps.on.includes('reportCreated') || ps.on.includes('reportResolved') || ps.on.includes('reportAutoResolved')) {
+			if (ps.on.some( item => ['reportCreated','reportResolved','reportAutoResolved','announceCreated'].includes(item) )) {
 				if (!await this.roleService.isAdministrator(me)) {
 					throw new ApiError(meta.errors.youAreNotAdmin);
 				}

packages/frontend/src/pages/settings/webhook.edit.vue

@@ -32,6 +32,7 @@
 			<MkSwitch v-if="$i?.isAdmin" v-model="event_reportCreated">{{ i18n.ts._webhookSettings._events.reportCreated }}</MkSwitch>
 			<MkSwitch v-if="$i?.isAdmin" v-model="event_reportResolved">{{ i18n.ts._webhookSettings._events.reportResolved }}</MkSwitch>
 			<MkSwitch v-if="$i?.isAdmin" v-model="event_reportAutoResolved">{{ i18n.ts._webhookSettings._events.reportAutoResolved }}</MkSwitch>
+			<MkSwitch v-if="$i?.isAdmin" v-model="event_announceCreated">{{ i18n.ts._webhookSettings._events.announceCreated }}</MkSwitch>
 		</div>
 	</FormSection>
 
@@ -95,6 +96,7 @@
 	if (event_reportCreated.value) events.push('reportCreated');
 	if (event_reportResolved.value) events.push('reportResolved');
 	if (event_reportAutoResolved.value) events.push('reportAutoResolved');
+	if (event_announceCreated.value) events.push('announceCreated');
 
 	os.apiWithDialog('i/webhooks/update', {
 		name: name.value,

packages/frontend/src/pages/settings/webhook.new.vue

@@ -32,6 +32,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkSwitch v-if="$i?.isAdmin" v-model="event_reportCreated">{{ i18n.ts._webhookSettings._events.reportCreated }}</MkSwitch>
 			<MkSwitch v-if="$i?.isAdmin" v-model="event_reportResolved">{{ i18n.ts._webhookSettings._events.reportResolved }}</MkSwitch>
 			<MkSwitch v-if="$i?.isAdmin" v-model="event_reportAutoResolved">{{ i18n.ts._webhookSettings._events.reportAutoResolved }}</MkSwitch>
+			<MkSwitch v-if="$i?.isAdmin" v-model="event_announceCreated">{{ i18n.ts._webhookSettings._events.announceCreated }}</MkSwitch>
 		</div>
 	</FormSection>
 
@@ -66,6 +67,7 @@ const event_mention = ref(true);
 const event_reportCreated = ref(false);
 const event_reportResolved = ref(false);
 const event_reportAutoResolved = ref(false);
+const event_announceCreated = ref(false);
 
 async function create(): Promise<void> {
 	const events = [];
@@ -79,6 +81,7 @@ async function create(): Promise<void> {
 	if (event_reportCreated.value) events.push('reportCreated');
 	if (event_reportResolved.value) events.push('reportResolved');
 	if (event_reportAutoResolved.value) events.push('reportAutoResolved');
+	if (event_announceCreated.value) events.push('announceCreated');
 
 	os.apiWithDialog('i/webhooks/create', {
 		name: name.value,