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
---
 .../src/server/api/endpoints/notes/polls/recommendation.ts   |  2 +-
 .../backend/src/server/api/endpoints/notes/polls/vote.ts     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts
index bdd1aeecd4..28bfade2f0 100644
--- a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts
+++ b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts
@@ -64,7 +64,7 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	if (polls.length === 0) return [];
 
-	const notes = await Notes.find({
+	const notes = await Notes.findBy({
 		id: In(polls.map(poll => poll.noteId)),
 	});
 
diff --git a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts
index ef52d03664..6380b331f2 100644
--- a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts
+++ b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts
@@ -83,7 +83,7 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	// Check blocking
 	if (note.userId !== user.id) {
-		const block = await Blockings.findOne({
+		const block = await Blockings.findOneBy({
 			blockerId: note.userId,
 			blockeeId: user.id,
 		});
@@ -92,7 +92,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		}
 	}
 
-	const poll = await Polls.findOneOrFail({ noteId: note.id });
+	const poll = await Polls.findOneByOrFail({ noteId: note.id });
 
 	if (poll.expiresAt && poll.expiresAt < createdAt) {
 		throw new ApiError(meta.errors.alreadyExpired);
@@ -103,7 +103,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 
 	// if already voted
-	const exist = await PollVotes.find({
+	const exist = await PollVotes.findBy({
 		noteId: note.id,
 		userId: user.id,
 	});
@@ -125,7 +125,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		noteId: note.id,
 		userId: user.id,
 		choice: ps.choice,
-	}).then(x => PollVotes.findOneOrFail(x.identifiers[0]));
+	}).then(x => PollVotes.findOneByOrFail(x.identifiers[0]));
 
 	// Increment votes count
 	const index = ps.choice + 1; // In SQL, array index is 1 based
@@ -144,7 +144,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// Fetch watchers
-	NoteWatchings.find({
+	NoteWatchings.findBy({
 		noteId: note.id,
 		userId: Not(user.id),
 	}).then(watchers => {
@@ -159,7 +159,7 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	// リモート投票の場合リプライ送信
 	if (note.userHost != null) {
-		const pollOwner = await Users.findOneOrFail(note.userId) as IRemoteUser;
+		const pollOwner = await Users.findOneByOrFail({ id: note.userId }) as IRemoteUser;
 
 		deliver(user, renderActivity(await renderVote(user, vote, note, poll, pollOwner)), pollOwner.inbox);
 	}
-- 
cgit v1.2.3-freya