oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

feat(webhook): 通報の登録、解決、自動解決に対応 (#615)

Browse source
This commit is contained in:
CyberRex 2024-04-22 09:22:11 +09:00 • committed by GitHub
parent 432833747d
commit 470ce2e0f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 114 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts
View file

@ -11,6 +11,8 @@ import { QueueService } from '@/core/QueueService.js';
import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
import { DI } from '@/di-symbols.js';
import { ModerationLogService } from '@/core/ModerationLogService.js';
import { WebhookService } from '@/core/WebhookService.js';
import { RoleService } from '@/core/RoleService.js';
export const meta = {
tags: ['admin'],
@ -44,6 +46,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
private instanceActorService: InstanceActorService,
private apRendererService: ApRendererService,
private moderationLogService: ModerationLogService,
private webhookService: WebhookService,
private roleService: RoleService,
) {
super(meta, paramDef, async (ps, me) => {
const report = await this.abuseUserReportsRepository.findOneBy({ id: ps.reportId });
@ -59,11 +63,24 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
this.queueService.deliver(actor, this.apRendererService.addContext(this.apRendererService.renderFlag(actor, targetUser.uri!, report.comment)), targetUser.inbox, false);
}
await this.abuseUserReportsRepository.update(report.id, {
const updatedReport = await this.abuseUserReportsRepository.update(report.id, {
resolved: true,
assigneeId: me.id,
forwarded: ps.forward && report.targetUserHost != null,
});
}).then(() => this.abuseUserReportsRepository.findOneBy({ id: ps.reportId }));
const activeWebhooks = await this.webhookService.getActiveWebhooks();
for (const webhook of activeWebhooks) {
const webhookUser = await this.usersRepository.findOneByOrFail({
id: webhook.userId,
});
const isAdmin = await this.roleService.isAdministrator(webhookUser);
if (webhook.on.includes('reportResolved') && isAdmin) {
this.queueService.webhookDeliver(webhook, 'reportResolved', {
updatedReport,
});
}
}
this.moderationLogService.log(me, 'resolveAbuseReport', {
reportId: report.id,