From 6060e7d22053eb1d99262737632fa1f7b16195c2 Mon Sep 17 00:00:00 2001 From: Johann150 Date: Mon, 16 May 2022 09:18:09 +0200 Subject: [PATCH] enhance: better rendering of reports Passing the report object reduces the number of parameters to be passed. --- packages/backend/src/remote/activitypub/renderer/flag.ts | 9 ++++----- .../api/endpoints/admin/resolve-abuse-user-report.ts | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/backend/src/remote/activitypub/renderer/flag.ts b/packages/backend/src/remote/activitypub/renderer/flag.ts index 292c44673..7834c1f28 100644 --- a/packages/backend/src/remote/activitypub/renderer/flag.ts +++ b/packages/backend/src/remote/activitypub/renderer/flag.ts @@ -1,13 +1,12 @@ import config from '@/config/index.js'; import { ILocalUser } from '@/models/entities/user.js'; +import { AbuseUserReport } from '@/models/entities/abuse-user-report.js'; -// to anonymise reporters, the reporting actor must be a system user -// object has to be a uri or array of uris -export const renderFlag = (user: ILocalUser, object: [string], content: string) => { +export const renderFlag = (user: ILocalUser, flag: AbuseUserReport) => { return { type: 'Flag', actor: `${config.url}/users/${user.id}`, - content, - object, + content: flag.comment, + object: flag.urls, }; }; diff --git a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts index 04ef3454e..27b2f547d 100644 --- a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts +++ b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts @@ -29,7 +29,7 @@ export default define(meta, paramDef, async (ps, me) => { const actor = await getInstanceActor(); const targetUser = await Users.findOneByOrFail({ id: report.targetUserId }); - deliver(actor, renderActivity(renderFlag(actor, report.urls, report.comment)), targetUser.inbox); + deliver(actor, renderActivity(renderFlag(actor, report)), targetUser.inbox); } await AbuseUserReports.update(report.id, {