From 1c67c26bd87aae64fe0f2ef45140e12a78564699 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 26 Mar 2022 15:34:00 +0900
Subject: refactor: migrate to typeorm 3.0 (#8443)

* wip

* wip

* wip

* Update following.ts

* wip

* wip

* wip

* Update resolve-user.ts

* maxQueryExecutionTime

* wip

* wip
---
 packages/backend/src/server/api/endpoints/ap/show.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'packages/backend/src/server/api/endpoints/ap')

diff --git a/packages/backend/src/server/api/endpoints/ap/show.ts b/packages/backend/src/server/api/endpoints/ap/show.ts
index 7595c38e8a..3c0c0642e3 100644
--- a/packages/backend/src/server/api/endpoints/ap/show.ts
+++ b/packages/backend/src/server/api/endpoints/ap/show.ts
@@ -97,7 +97,7 @@ async function fetchAny(uri: string): Promise<SchemaType<typeof meta['res']> | n
 		const type = parts.pop();
 
 		if (type === 'notes') {
-			const note = await Notes.findOne(id);
+			const note = await Notes.findOneBy({ id });
 
 			if (note) {
 				return {
@@ -106,7 +106,7 @@ async function fetchAny(uri: string): Promise<SchemaType<typeof meta['res']> | n
 				};
 			}
 		} else if (type === 'users') {
-			const user = await Users.findOne(id);
+			const user = await Users.findOneBy({ id });
 
 			if (user) {
 				return {
@@ -124,8 +124,8 @@ async function fetchAny(uri: string): Promise<SchemaType<typeof meta['res']> | n
 	// URI(AP Object id)としてDB検索
 	{
 		const [user, note] = await Promise.all([
-			Users.findOne({ uri: uri }),
-			Notes.findOne({ uri: uri }),
+			Users.findOneBy({ uri: uri }),
+			Notes.findOneBy({ uri: uri }),
 		]);
 
 		const packed = await mergePack(user, note);
@@ -145,7 +145,7 @@ async function fetchAny(uri: string): Promise<SchemaType<typeof meta['res']> | n
 			const type = parts.pop();
 
 			if (type === 'notes') {
-				const note = await Notes.findOne(id);
+				const note = await Notes.findOneBy({ id });
 
 				if (note) {
 					return {
@@ -154,7 +154,7 @@ async function fetchAny(uri: string): Promise<SchemaType<typeof meta['res']> | n
 					};
 				}
 			} else if (type === 'users') {
-				const user = await Users.findOne(id);
+				const user = await Users.findOneBy({ id });
 
 				if (user) {
 					return {
@@ -166,8 +166,8 @@ async function fetchAny(uri: string): Promise<SchemaType<typeof meta['res']> | n
 		}
 
 		const [user, note] = await Promise.all([
-			Users.findOne({ uri: object.id }),
-			Notes.findOne({ uri: object.id }),
+			Users.findOneBy({ uri: object.id }),
+			Notes.findOneBy({ uri: object.id }),
 		]);
 
 		const packed = await mergePack(user, note);
-- 
cgit v1.2.3-freya