diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-08-16 17:51:28 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-16 17:51:28 +0900 |
| commit | 792622aeadf3e36d50cddec3c64b2ff0105ea927 (patch) | |
| tree | c42a71da86be3c33e2752b4c673e280b1158e57b /packages/backend/src/core/RemoteUserResolveService.ts | |
| parent | build(deps): bump actions/setup-node from 3.7.0 to 3.8.0 (#11726) (diff) | |
| download | sharkey-792622aeadf3e36d50cddec3c64b2ff0105ea927.tar.gz sharkey-792622aeadf3e36d50cddec3c64b2ff0105ea927.tar.bz2 sharkey-792622aeadf3e36d50cddec3c64b2ff0105ea927.zip | |
refactor: prefix Mi for all entities (#11719)
* wip
* wip
* wip
* wip
* Update RepositoryModule.ts
* wip
* wip
* wip
* Revert "wip"
This reverts commit c1c13b37d2aaf3c65bc148212da302b0eb7868bf.
Diffstat (limited to 'packages/backend/src/core/RemoteUserResolveService.ts')
| -rw-r--r-- | packages/backend/src/core/RemoteUserResolveService.ts | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/packages/backend/src/core/RemoteUserResolveService.ts b/packages/backend/src/core/RemoteUserResolveService.ts index 31682ea98d..ca538ed6cd 100644 --- a/packages/backend/src/core/RemoteUserResolveService.ts +++ b/packages/backend/src/core/RemoteUserResolveService.ts @@ -9,7 +9,7 @@ import chalk from 'chalk'; import { IsNull } from 'typeorm'; import { DI } from '@/di-symbols.js'; import type { UsersRepository } from '@/models/index.js'; -import type { LocalUser, RemoteUser } from '@/models/entities/User.js'; +import type { MiLocalUser, MiRemoteUser } from '@/models/entities/User.js'; import type { Config } from '@/config.js'; import type Logger from '@/logger.js'; import { UtilityService } from '@/core/UtilityService.js'; @@ -40,7 +40,7 @@ export class RemoteUserResolveService { } @bindThis - public async resolveUser(username: string, host: string | null): Promise<LocalUser | RemoteUser> { + public async resolveUser(username: string, host: string | null): Promise<MiLocalUser | MiRemoteUser> { const usernameLower = username.toLowerCase(); if (host == null) { @@ -51,7 +51,7 @@ export class RemoteUserResolveService { } else { return u; } - }) as LocalUser; + }) as MiLocalUser; } host = this.utilityService.toPuny(host); @@ -64,10 +64,10 @@ export class RemoteUserResolveService { } else { return u; } - }) as LocalUser; + }) as MiLocalUser; } - const user = await this.usersRepository.findOneBy({ usernameLower, host }) as RemoteUser | null; + const user = await this.usersRepository.findOneBy({ usernameLower, host }) as MiRemoteUser | null; const acctLower = `${usernameLower}@${host}`; @@ -86,7 +86,7 @@ export class RemoteUserResolveService { } else { return u; } - })) as LocalUser; + })) as MiLocalUser; } } @@ -132,7 +132,7 @@ export class RemoteUserResolveService { if (u == null) { throw new Error('user not found'); } else { - return u as LocalUser | RemoteUser; + return u as MiLocalUser | MiRemoteUser; } }); } |