From 0047396cf243db3f14ceace6a0940d75d84c0fad Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 15 Sep 2025 18:26:40 -0400
Subject: [PATCH] remove null option from uriPersonCache

---
 packages/backend/src/core/CacheService.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/backend/src/core/CacheService.ts b/packages/backend/src/core/CacheService.ts
index e3f92b3a68..12fa4f501f 100644
--- a/packages/backend/src/core/CacheService.ts
+++ b/packages/backend/src/core/CacheService.ts
@@ -34,8 +34,8 @@ export interface FollowStats {
 @Injectable()
 export class CacheService implements OnApplicationShutdown {
 	public readonly userByIdCache: ManagedQuantumKVCache<MiUser>;
-	public readonly nativeTokenCache: ManagedQuantumKVCache<string | null>; // Token -> UserId
-	public readonly uriPersonCache: ManagedQuantumKVCache<string | null>; // URI -> UserId
+	public readonly nativeTokenCache: ManagedQuantumKVCache<string>; // Token -> UserId
+	public readonly uriPersonCache: ManagedQuantumKVCache<string>; // URI -> UserId
 	public readonly userByAcctCache: ManagedQuantumKVCache<string>; // Acct -> UserId
 	public readonly userProfileCache: ManagedQuantumKVCache<MiUserProfile>;
 	public readonly userMutingsCache: ManagedQuantumKVCache<Set<string>>;
@@ -139,14 +139,14 @@ export class CacheService implements OnApplicationShutdown {
 		});
 
 		this.uriPersonCache = this.cacheManagementService.createQuantumKVCache('uriPerson', {
-			lifetime: 1000 * 60 * 5, // 5m
+			lifetime: 1000 * 60 * 30, // 30m
 			fetcher: async (uri) => {
 				const user = await this.usersRepository
 					.createQueryBuilder('user')
 					.select('user.id')
 					.where({ uri })
-					.getOne() as { id: string } | null;
-				return user?.id ?? null;
+					.getOneOrFail() as { id: string };
+				return user.id;
 			},
 			bulkFetcher: async (uris) => {
 				const users = await this.usersRepository
@@ -155,8 +155,7 @@ export class CacheService implements OnApplicationShutdown {
 					.addSelect('user.uri')
 					.where({ uri: In(uris) })
 					.getMany() as { id: string, uri: string }[];
-				const userMap = new Map(users.map(u => [u.uri, u.id]));
-				return uris.map(uri => [uri, userMap.get(uri) ?? null]);
+				return users.map(u => [u.uri, u.id]);
 			},
 		});