From 79ea21fdc4aadb013f65cc0366bbb940f5c5523d Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 1 Oct 2025 12:34:58 -0400
Subject: [PATCH] use CacheService in GetterService

---
 packages/backend/src/server/api/GetterService.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/backend/src/server/api/GetterService.ts b/packages/backend/src/server/api/GetterService.ts
index f2850e6258..edf70c0185 100644
--- a/packages/backend/src/server/api/GetterService.ts
+++ b/packages/backend/src/server/api/GetterService.ts
@@ -8,8 +8,9 @@ import { DI } from '@/di-symbols.js';
 import type { NotesRepository, UsersRepository, NoteEditRepository } from '@/models/_.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/User.js';
+import { isRemoteUser, isLocalUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { CacheService } from '@/core/CacheService.js';
 import { bindThis } from '@/decorators.js';
 
 @Injectable()
@@ -24,7 +25,7 @@ export class GetterService {
 		@Inject(DI.noteEditRepository)
 		private noteEditRepository: NoteEditRepository,
 
-		private userEntityService: UserEntityService,
+		private readonly cacheService: CacheService,
 	) {
 	}
 
@@ -70,7 +71,7 @@ export class GetterService {
 	 */
 	@bindThis
 	public async getUser(userId: MiUser['id']) {
-		const user = await this.usersRepository.findOneBy({ id: userId });
+		const user = await this.cacheService.findOptionalUserById(userId);
 
 		if (user == null) {
 			throw new IdentifiableError('15348ddd-432d-49c2-8a5a-8069753becff', `User ${userId} does not exist`);
@@ -86,8 +87,8 @@ export class GetterService {
 	public async getRemoteUser(userId: MiUser['id']) {
 		const user = await this.getUser(userId);
 
-		if (!this.userEntityService.isRemoteUser(user)) {
-			throw new Error('user is not a remote user');
+		if (!isRemoteUser(user)) {
+			throw new IdentifiableError('aeac1339-2550-4521-a8e3-781f06d98656', 'User is not remote');
 		}
 
 		return user;
@@ -100,8 +101,8 @@ export class GetterService {
 	public async getLocalUser(userId: MiUser['id']) {
 		const user = await this.getUser(userId);
 
-		if (!this.userEntityService.isLocalUser(user)) {
-			throw new Error('user is not a local user');
+		if (!isLocalUser(user)) {
+			throw new IdentifiableError('aeac1339-2550-4521-a8e3-781f06d98656', 'User is not local');
 		}
 
 		return user;