From 4307010a9fe6ba347ea7795710548c22adaceda5 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 1 May 2023 12:50:39 +0200
Subject: [PATCH] fix new occurences of isDeleted

---
 packages/backend/src/server/api/common/getters.ts | 6 +++---
 packages/backend/src/server/api/private/signin.ts | 2 +-
 packages/backend/src/server/web/index.ts          | 8 ++++----
 packages/backend/src/services/user-cache.ts       | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/server/api/common/getters.ts b/packages/backend/src/server/api/common/getters.ts
index 97059f987..f15ae39f8 100644
--- a/packages/backend/src/server/api/common/getters.ts
+++ b/packages/backend/src/server/api/common/getters.ts
@@ -32,7 +32,7 @@ export async function getNote(noteId: Note['id'], me: { id: User['id'] } | null)
 export async function getUser(userId: User['id'], includeSuspended = false) {
 	const user = await Users.findOneBy({
 		id: userId,
-		isDeleted: false,
+		isDeleted: IsNull(),
 		...(includeSuspended ? {} : {isSuspended: false}),
 	});
 
@@ -50,7 +50,7 @@ export async function getRemoteUser(userId: User['id'], includeSuspended = false
 	const user = await Users.findOneBy({
 		id: userId,
 		host: Not(IsNull()),
-		isDeleted: false,
+		isDeleted: IsNull(),
 		...(includeSuspended ? {} : {isSuspended: false}),
 	});
 
@@ -68,7 +68,7 @@ export async function getLocalUser(userId: User['id'], includeSuspended = false)
 	const user = await Users.findOneBy({
 		id: userId,
 		host: IsNull(),
-		isDeleted: false,
+		isDeleted: IsNull(),
 		...(includeSuspended ? {} : {isSuspended: false}),
 	});
 
diff --git a/packages/backend/src/server/api/private/signin.ts b/packages/backend/src/server/api/private/signin.ts
index b09262bb1..75d2a56de 100644
--- a/packages/backend/src/server/api/private/signin.ts
+++ b/packages/backend/src/server/api/private/signin.ts
@@ -47,7 +47,7 @@ export default async (ctx: Koa.Context) => {
 	const user = await Users.findOneBy({
 		usernameLower: username.toLowerCase(),
 		host: IsNull(),
-		isDeleted: false,
+		isDeleted: IsNull(),
 	}) as ILocalUser;
 
 	if (user == null) {
diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index 7c04077d4..2f9a76c84 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -223,7 +223,7 @@ const getFeed = async (acct: string) => {
 		usernameLower: username.toLowerCase(),
 		host: host ?? IsNull(),
 		isSuspended: false,
-		isDeleted: false,
+		isDeleted: IsNull(),
 	});
 
 	return user && await packFeed(user);
@@ -273,7 +273,7 @@ router.get(['/@:user', '/@:user/:sub'], async (ctx, next) => {
 		usernameLower: username.toLowerCase(),
 		host: host ?? IsNull(),
 		isSuspended: false,
-		isDeleted: false,
+		isDeleted: IsNull(),
 	});
 
 	if (user != null) {
@@ -306,7 +306,7 @@ router.get('/users/:user', async ctx => {
 		id: ctx.params.user,
 		host: IsNull(),
 		isSuspended: false,
-		isDeleted: false,
+		isDeleted: IsNull(),
 	});
 
 	if (user == null) {
@@ -423,7 +423,7 @@ router.get('/@:user/pages/:page', async (ctx, next) => {
 		usernameLower: username.toLowerCase(),
 		host: host ?? IsNull(),
 		isSuspended: false,
-		isDeleted: false,
+		isDeleted: IsNull(),
 	});
 
 	if (user == null) return;
diff --git a/packages/backend/src/services/user-cache.ts b/packages/backend/src/services/user-cache.ts
index 77c5d0541..a886e398d 100644
--- a/packages/backend/src/services/user-cache.ts
+++ b/packages/backend/src/services/user-cache.ts
@@ -6,15 +6,15 @@ import { subscriber } from '@/db/redis.js';
 
 export const userByIdCache = new Cache<User>(
 	Infinity,
-	async (id) => await Users.findOneBy({ id, isDeleted: false }) ?? undefined,
+	async (id) => await Users.findOneBy({ id, isDeleted: IsNull() }) ?? undefined,
 );
 export const localUserByNativeTokenCache = new Cache<ILocalUser>(
 	Infinity,
-	async (token) => await Users.findOneBy({ token, host: IsNull(), isDeleted: false }) as ILocalUser | null ?? undefined,
+	async (token) => await Users.findOneBy({ token, host: IsNull(), isDeleted: isNull() }) as ILocalUser | null ?? undefined,
 );
 export const uriPersonCache = new Cache<User>(
 	Infinity,
-	async (uri) => await Users.findOneBy({ uri, isDeleted: false }) ?? undefined,
+	async (uri) => await Users.findOneBy({ uri, isDeleted: IsNull() }) ?? undefined,
 );
 
 subscriber.on('message', async (_, data) => {