diff options
Diffstat (limited to 'packages/backend/src/core/RelayService.ts')
| -rw-r--r-- | packages/backend/src/core/RelayService.ts | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/packages/backend/src/core/RelayService.ts b/packages/backend/src/core/RelayService.ts index 1ac906991b..89f245e86d 100644 --- a/packages/backend/src/core/RelayService.ts +++ b/packages/backend/src/core/RelayService.ts @@ -5,11 +5,11 @@ import { Inject, Injectable } from '@nestjs/common'; import { IsNull } from 'typeorm'; -import type { LocalUser, User } from '@/models/entities/User.js'; +import type { MiLocalUser, MiUser } from '@/models/entities/User.js'; import type { RelaysRepository, UsersRepository } from '@/models/index.js'; import { IdService } from '@/core/IdService.js'; import { MemorySingleCache } from '@/misc/cache.js'; -import type { Relay } from '@/models/entities/Relay.js'; +import type { MiRelay } from '@/models/entities/Relay.js'; import { QueueService } from '@/core/QueueService.js'; import { CreateSystemUserService } from '@/core/CreateSystemUserService.js'; import { ApRendererService } from '@/core/activitypub/ApRendererService.js'; @@ -21,7 +21,7 @@ const ACTOR_USERNAME = 'relay.actor' as const; @Injectable() export class RelayService { - private relaysCache: MemorySingleCache<Relay[]>; + private relaysCache: MemorySingleCache<MiRelay[]>; constructor( @Inject(DI.usersRepository) @@ -35,24 +35,24 @@ export class RelayService { private createSystemUserService: CreateSystemUserService, private apRendererService: ApRendererService, ) { - this.relaysCache = new MemorySingleCache<Relay[]>(1000 * 60 * 10); + this.relaysCache = new MemorySingleCache<MiRelay[]>(1000 * 60 * 10); } @bindThis - private async getRelayActor(): Promise<LocalUser> { + private async getRelayActor(): Promise<MiLocalUser> { const user = await this.usersRepository.findOneBy({ host: IsNull(), username: ACTOR_USERNAME, }); - if (user) return user as LocalUser; + if (user) return user as MiLocalUser; const created = await this.createSystemUserService.createSystemUser(ACTOR_USERNAME); - return created as LocalUser; + return created as MiLocalUser; } @bindThis - public async addRelay(inbox: string): Promise<Relay> { + public async addRelay(inbox: string): Promise<MiRelay> { const relay = await this.relaysRepository.insert({ id: this.idService.genId(), inbox, @@ -87,7 +87,7 @@ export class RelayService { } @bindThis - public async listRelay(): Promise<Relay[]> { + public async listRelay(): Promise<MiRelay[]> { const relays = await this.relaysRepository.find(); return relays; } @@ -111,7 +111,7 @@ export class RelayService { } @bindThis - public async deliverToRelays(user: { id: User['id']; host: null; }, activity: any): Promise<void> { + public async deliverToRelays(user: { id: MiUser['id']; host: null; }, activity: any): Promise<void> { if (activity == null) return; const relays = await this.relaysCache.fetch(() => this.relaysRepository.findBy({ |