From 79c4c79386a9129895784dc047903cda64851a26 Mon Sep 17 00:00:00 2001 From: piuvas Date: Tue, 27 May 2025 14:08:00 -0300 Subject: fix lint and typecheck. --- packages/backend/src/core/WebhookTestService.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/backend/src/core/WebhookTestService.ts') diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts index 2f8cfea7f7..406998dbc7 100644 --- a/packages/backend/src/core/WebhookTestService.ts +++ b/packages/backend/src/core/WebhookTestService.ts @@ -76,6 +76,7 @@ function generateDummyUser(override?: Partial): MiUser { mandatoryCW: null, rejectQuotes: false, allowUnsignedFetch: 'staff', + attributionDomains: [], ...override, }; } -- cgit v1.2.3-freya From 788e59f046f80cb16c0098052722738109eea772 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sun, 25 May 2025 12:17:11 -0400 Subject: fix type errors caused by new User, Note, and Instance fields --- packages/backend/src/core/ReversiService.ts | 2 ++ packages/backend/src/core/WebhookTestService.ts | 5 +++++ packages/backend/test/unit/NoteCreateService.ts | 3 +++ packages/backend/test/unit/misc/is-renote.ts | 3 +++ 4 files changed, 13 insertions(+) (limited to 'packages/backend/src/core/WebhookTestService.ts') diff --git a/packages/backend/src/core/ReversiService.ts b/packages/backend/src/core/ReversiService.ts index 8c0a8f6cc7..e31d9e5b1a 100644 --- a/packages/backend/src/core/ReversiService.ts +++ b/packages/backend/src/core/ReversiService.ts @@ -587,6 +587,7 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit { lastActiveDate: parsed.user1.lastActiveDate != null ? new Date(parsed.user1.lastActiveDate) : null, lastFetchedAt: parsed.user1.lastFetchedAt != null ? new Date(parsed.user1.lastFetchedAt) : null, movedAt: parsed.user1.movedAt != null ? new Date(parsed.user1.movedAt) : null, + instance: null, } : null, user2: parsed.user2 != null ? { ...parsed.user2, @@ -597,6 +598,7 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit { lastActiveDate: parsed.user2.lastActiveDate != null ? new Date(parsed.user2.lastActiveDate) : null, lastFetchedAt: parsed.user2.lastFetchedAt != null ? new Date(parsed.user2.lastFetchedAt) : null, movedAt: parsed.user2.movedAt != null ? new Date(parsed.user2.movedAt) : null, + instance: null, } : null, }; } else { diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts index 2f8cfea7f7..afd011c410 100644 --- a/packages/backend/src/core/WebhookTestService.ts +++ b/packages/backend/src/core/WebhookTestService.ts @@ -63,6 +63,7 @@ function generateDummyUser(override?: Partial): MiUser { emojis: [], score: 0, host: null, + instance: null, inbox: null, sharedInbox: null, featured: null, @@ -114,10 +115,13 @@ function generateDummyNote(override?: Partial): MiNote { channelId: null, channel: null, userHost: null, + userInstance: null, replyUserId: null, replyUserHost: null, + replyUserInstance: null, renoteUserId: null, renoteUserHost: null, + renoteUserInstance: null, updatedAt: null, processErrors: [], ...override, @@ -449,6 +453,7 @@ export class WebhookTestService { isAdmin: false, isModerator: false, isSystem: false, + instance: undefined, ...override, }; } diff --git a/packages/backend/test/unit/NoteCreateService.ts b/packages/backend/test/unit/NoteCreateService.ts index f4ecfef34d..63e3795a84 100644 --- a/packages/backend/test/unit/NoteCreateService.ts +++ b/packages/backend/test/unit/NoteCreateService.ts @@ -57,10 +57,13 @@ describe('NoteCreateService', () => { channelId: null, channel: null, userHost: null, + userInstance: null, replyUserId: null, replyUserHost: null, + replyUserInstance: null, renoteUserId: null, renoteUserHost: null, + renoteUserInstance: null, processErrors: [], }; diff --git a/packages/backend/test/unit/misc/is-renote.ts b/packages/backend/test/unit/misc/is-renote.ts index 24cd2236bb..b6cfa53466 100644 --- a/packages/backend/test/unit/misc/is-renote.ts +++ b/packages/backend/test/unit/misc/is-renote.ts @@ -40,10 +40,13 @@ const base: MiNote = { channelId: null, channel: null, userHost: null, + userInstance: null, replyUserId: null, replyUserHost: null, + replyUserInstance: null, renoteUserId: null, renoteUserHost: null, + renoteUserInstance: null, processErrors: [], }; -- cgit v1.2.3-freya From f17e4641888d82e28daaf125280a68fc13277cc9 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Wed, 28 May 2025 02:19:30 -0400 Subject: fix WebhookTestService again --- packages/backend/src/core/WebhookTestService.ts | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'packages/backend/src/core/WebhookTestService.ts') diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts index 8c1508df24..7c85a32427 100644 --- a/packages/backend/src/core/WebhookTestService.ts +++ b/packages/backend/src/core/WebhookTestService.ts @@ -77,6 +77,7 @@ function generateDummyUser(override?: Partial): MiUser { mandatoryCW: null, rejectQuotes: false, allowUnsignedFetch: 'staff', + userProfile: null, attributionDomains: [], ...override, }; @@ -363,10 +364,15 @@ export class WebhookTestService { id: 'dummy-abuse-report1', targetUserId: 'dummy-target-user', targetUser: null, + targetUserProfile: null, + targetUserInstance: null, reporterId: 'dummy-reporter-user', reporter: null, + reporterProfile: null, + reporterInstance: null, assigneeId: null, assignee: null, + assigneeProfile: null, resolved: false, forwarded: false, comment: 'This is a dummy report for testing purposes.', -- cgit v1.2.3-freya From d86530a069061e81bfa4661ee75fb896b33e3e7d Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Fri, 30 May 2025 14:28:24 -0400 Subject: remove unused fields from WebhookTestService.ts --- packages/backend/src/core/WebhookTestService.ts | 3 --- packages/backend/test/unit/AbuseReportNotificationService.ts | 3 --- 2 files changed, 6 deletions(-) (limited to 'packages/backend/src/core/WebhookTestService.ts') diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts index 7c85a32427..c4b01d535b 100644 --- a/packages/backend/src/core/WebhookTestService.ts +++ b/packages/backend/src/core/WebhookTestService.ts @@ -364,15 +364,12 @@ export class WebhookTestService { id: 'dummy-abuse-report1', targetUserId: 'dummy-target-user', targetUser: null, - targetUserProfile: null, targetUserInstance: null, reporterId: 'dummy-reporter-user', reporter: null, - reporterProfile: null, reporterInstance: null, assigneeId: null, assignee: null, - assigneeProfile: null, resolved: false, forwarded: false, comment: 'This is a dummy report for testing purposes.', diff --git a/packages/backend/test/unit/AbuseReportNotificationService.ts b/packages/backend/test/unit/AbuseReportNotificationService.ts index 55ec755dc7..ee68b10f1b 100644 --- a/packages/backend/test/unit/AbuseReportNotificationService.ts +++ b/packages/backend/test/unit/AbuseReportNotificationService.ts @@ -367,15 +367,12 @@ describe('AbuseReportNotificationService', () => { id: idService.gen(), targetUserId: alice.id, targetUser: alice, - targetUserProfile: null, targetUserInstance: null, reporterId: bob.id, reporter: bob, - reporterProfile: null, reporterInstance: null, assigneeId: null, assignee: null, - assigneeProfile: null, resolved: false, forwarded: false, comment: 'test', -- cgit v1.2.3-freya From b3548cde5b35c00503f1fba40db21ea865517d32 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Fri, 13 Jun 2025 21:03:12 -0400 Subject: fix TS errors --- packages/backend/src/core/WebhookTestService.ts | 4 ++++ packages/backend/test/utils.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'packages/backend/src/core/WebhookTestService.ts') diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts index c4b01d535b..8dc42e45c0 100644 --- a/packages/backend/src/core/WebhookTestService.ts +++ b/packages/backend/src/core/WebhookTestService.ts @@ -13,6 +13,7 @@ import { type WebhookEventTypes } from '@/models/Webhook.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js'; import { type UserWebhookPayload, UserWebhookService } from '@/core/UserWebhookService.js'; import { QueueService } from '@/core/QueueService.js'; +import { IdService } from '@/core/IdService.js'; import { ModeratorInactivityRemainingTime } from '@/queue/processors/CheckModeratorsActivityProcessorService.js'; const oneDayMillis = 24 * 60 * 60 * 1000; @@ -166,6 +167,7 @@ export class WebhookTestService { private userWebhookService: UserWebhookService, private systemWebhookService: SystemWebhookService, private queueService: QueueService, + private readonly idService: IdService, ) { } @@ -449,6 +451,8 @@ export class WebhookTestService { offsetX: it.offsetX, offsetY: it.offsetY, })), + createdAt: this.idService.parse(user.id).date.toISOString(), + description: '', isBot: user.isBot, isCat: user.isCat, emojis: await this.customEmojiService.populateEmojis(user.emojis, user.host), diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts index 5da5353e09..52cfb8ac93 100644 --- a/packages/backend/test/utils.ts +++ b/packages/backend/test/utils.ts @@ -652,7 +652,7 @@ export async function sendEnvResetRequest() { // 与えられた値を強制的にエラーとみなす。この関数は型安全性を破壊するため、異常系のアサーション以外で用いられるべきではない。 // FIXME(misskey-js): misskey-jsがエラー情報を公開するようになったらこの関数を廃止する -export function castAsError(obj: Record): { error: ApiError } { +export function castAsError(obj: object | null | undefined): { error: ApiError } { return obj as { error: ApiError }; } -- cgit v1.2.3-freya