misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

use CacheService in GetterService

Browse source
This commit is contained in:
Hazelnoot 2025-10-01 12:34:58 -04:00
parent 8a2de1b9da
commit 79ea21fdc4
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
packages/backend/src/server/api/GetterService.ts
View file

@ -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;