diff options
| author | おさむのひと <46447427+samunohito@users.noreply.github.com> | 2024-10-05 12:51:46 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-05 12:51:46 +0900 |
| commit | 88698462a91e0fe15501a44f923a812d169bb030 (patch) | |
| tree | 43e9cbb5e67e1f0cb03df3e81681b9575922fdfc /packages/backend/src/core/WebhookTestService.ts | |
| parent | fix: signin の資格情報が足りないだけの場合はエラーにせ... (diff) | |
| download | sharkey-88698462a91e0fe15501a44f923a812d169bb030.tar.gz sharkey-88698462a91e0fe15501a44f923a812d169bb030.tar.bz2 sharkey-88698462a91e0fe15501a44f923a812d169bb030.zip | |
feat(backend): 通報および通報解決時に送出されるSystemWebhookにユーザ情報を含めるようにする (#14698)
* feat(backend): 通報および通報解決時に送出されるSystemWebhookにユーザ情報を含めるようにする
* テスト送信もペイロード形式を合わせる
* add spaces
* fix test
Diffstat (limited to 'packages/backend/src/core/WebhookTestService.ts')
| -rw-r--r-- | packages/backend/src/core/WebhookTestService.ts | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts index c2764f30e8..149c753d4c 100644 --- a/packages/backend/src/core/WebhookTestService.ts +++ b/packages/backend/src/core/WebhookTestService.ts @@ -15,8 +15,14 @@ import { QueueService } from '@/core/QueueService.js'; const oneDayMillis = 24 * 60 * 60 * 1000; -function generateAbuseReport(override?: Partial<MiAbuseUserReport>): MiAbuseUserReport { - return { +type AbuseUserReportDto = Omit<MiAbuseUserReport, 'targetUser' | 'reporter' | 'assignee'> & { + targetUser: Packed<'UserLite'> | null, + reporter: Packed<'UserLite'> | null, + assignee: Packed<'UserLite'> | null, +}; + +function generateAbuseReport(override?: Partial<MiAbuseUserReport>): AbuseUserReportDto { + const result: MiAbuseUserReport = { id: 'dummy-abuse-report1', targetUserId: 'dummy-target-user', targetUser: null, @@ -31,6 +37,13 @@ function generateAbuseReport(override?: Partial<MiAbuseUserReport>): MiAbuseUser reporterHost: null, ...override, }; + + return { + ...result, + targetUser: result.targetUser ? toPackedUserLite(result.targetUser) : null, + reporter: result.reporter ? toPackedUserLite(result.reporter) : null, + assignee: result.assignee ? toPackedUserLite(result.assignee) : null, + }; } function generateDummyUser(override?: Partial<MiUser>): MiUser { @@ -268,7 +281,8 @@ const dummyUser3 = generateDummyUser({ @Injectable() export class WebhookTestService { - public static NoSuchWebhookError = class extends Error {}; + public static NoSuchWebhookError = class extends Error { + }; constructor( private userWebhookService: UserWebhookService, |