From b6db709e0210ca741db2aae63b16947d3f28545d Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 19 Feb 2022 14:53:33 +0900
Subject: [PATCH] refacator: fix typw

---
 packages/backend/src/queue/processors/db/delete-account.ts    | 4 ++--
 .../backend/src/queue/processors/db/export-custom-emojis.ts   | 2 +-
 packages/backend/src/queue/processors/db/export-following.ts  | 2 +-
 packages/backend/src/queue/processors/db/export-notes.ts      | 2 +-
 packages/backend/src/remote/activitypub/models/person.ts      | 2 +-
 .../backend/src/server/api/endpoints/admin/promo/create.ts    | 1 -
 packages/backend/src/services/messages/create.ts              | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/queue/processors/db/delete-account.ts b/packages/backend/src/queue/processors/db/delete-account.ts
index 4b620842a..3af181d1d 100644
--- a/packages/backend/src/queue/processors/db/delete-account.ts
+++ b/packages/backend/src/queue/processors/db/delete-account.ts
@@ -31,7 +31,7 @@ export async function deleteAccount(job: Bull.Job<DbUserDeleteJobData>): Promise
 				order: {
 					id: 1,
 				},
-			});
+			}) as Note[];
 
 			if (notes.length === 0) {
 				break;
@@ -58,7 +58,7 @@ export async function deleteAccount(job: Bull.Job<DbUserDeleteJobData>): Promise
 				order: {
 					id: 1,
 				},
-			});
+			}) as DriveFile[];
 
 			if (files.length === 0) {
 				break;
diff --git a/packages/backend/src/queue/processors/db/export-custom-emojis.ts b/packages/backend/src/queue/processors/db/export-custom-emojis.ts
index 2f7505f15..28d54661c 100644
--- a/packages/backend/src/queue/processors/db/export-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/export-custom-emojis.ts
@@ -75,7 +75,7 @@ export async function exportCustomEmojis(job: Bull.Job, done: () => void): Promi
 			await downloadUrl(emoji.originalUrl, emojiPath);
 			downloaded = true;
 		} catch (e) { // TODO: 何度か再試行
-			logger.error(e);
+			logger.error(e instanceof Error ? e : new Error(e as string));
 		}
 
 		if (!downloaded) {
diff --git a/packages/backend/src/queue/processors/db/export-following.ts b/packages/backend/src/queue/processors/db/export-following.ts
index 2ac558381..d63904aa4 100644
--- a/packages/backend/src/queue/processors/db/export-following.ts
+++ b/packages/backend/src/queue/processors/db/export-following.ts
@@ -51,7 +51,7 @@ export async function exportFollowing(job: Bull.Job<DbUserJobData>, done: () =>
 			order: {
 				id: 1,
 			},
-		});
+		}) as Following[];
 
 		if (followings.length === 0) {
 			break;
diff --git a/packages/backend/src/queue/processors/db/export-notes.ts b/packages/backend/src/queue/processors/db/export-notes.ts
index 0e65cb884..6719cf0bb 100644
--- a/packages/backend/src/queue/processors/db/export-notes.ts
+++ b/packages/backend/src/queue/processors/db/export-notes.ts
@@ -62,7 +62,7 @@ export async function exportNotes(job: Bull.Job<DbUserJobData>, done: any): Prom
 			order: {
 				id: 1,
 			},
-		});
+		}) as Note[];
 
 		if (notes.length === 0) {
 			job.progress(100);
diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index aaccf51fa..12660a544 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -199,7 +199,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 				throw new Error('already registered');
 			}
 		} else {
-			logger.error(e);
+			logger.error(e instanceof Error ? e : new Error(e as string));
 			throw e;
 		}
 	}
diff --git a/packages/backend/src/server/api/endpoints/admin/promo/create.ts b/packages/backend/src/server/api/endpoints/admin/promo/create.ts
index 2ba35306d..16f522729 100644
--- a/packages/backend/src/server/api/endpoints/admin/promo/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/promo/create.ts
@@ -48,7 +48,6 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	await PromoNotes.insert({
 		noteId: note.id,
-		createdAt: new Date(),
 		expiresAt: new Date(ps.expiresAt),
 		userId: note.userId,
 	});
diff --git a/packages/backend/src/services/messages/create.ts b/packages/backend/src/services/messages/create.ts
index e1bef09a7..dc89bc785 100644
--- a/packages/backend/src/services/messages/create.ts
+++ b/packages/backend/src/services/messages/create.ts
@@ -13,7 +13,7 @@ import renderCreate from '@/remote/activitypub/renderer/create';
 import { renderActivity } from '@/remote/activitypub/renderer/index';
 import { deliver } from '@/queue/index';
 
-export async function createMessage(user: { id: User['id']; host: User['host']; }, recipientUser: User | undefined, recipientGroup: UserGroup | undefined, text: string | undefined, file: DriveFile | null, uri?: string) {
+export async function createMessage(user: { id: User['id']; host: User['host']; }, recipientUser: User | undefined, recipientGroup: UserGroup | undefined, text: string | null | undefined, file: DriveFile | null, uri?: string) {
 	const message = {
 		id: genId(),
 		createdAt: new Date(),