summaryrefslogtreecommitdiff
path: root/packages/backend/src/core/RemoteUserResolveService.ts
diff options
context:
space:
mode:
authorokayurisotto <okayurisotto@proton.me>2023-07-08 07:08:16 +0900
committerGitHub <noreply@github.com>2023-07-08 07:08:16 +0900
commitd84796588c1472334ddaf696a817f015c245ce44 (patch)
tree45caa2d8659d35b90bc3f36170e764aa5eb90b70 /packages/backend/src/core/RemoteUserResolveService.ts
parentperf(backend): Improve performance of FetchInstanceMetadata (#11128) (diff)
downloadsharkey-d84796588c1472334ddaf696a817f015c245ce44.tar.gz
sharkey-d84796588c1472334ddaf696a817f015c245ce44.tar.bz2
sharkey-d84796588c1472334ddaf696a817f015c245ce44.zip
cleanup: trim trailing whitespace (#11136)
* cleanup: trim trailing whitespace * update(`.editorconfig`) --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/backend/src/core/RemoteUserResolveService.ts')
-rw-r--r--packages/backend/src/core/RemoteUserResolveService.ts30
1 files changed, 15 insertions, 15 deletions
diff --git a/packages/backend/src/core/RemoteUserResolveService.ts b/packages/backend/src/core/RemoteUserResolveService.ts
index ff68c24219..ed15a1f1ce 100644
--- a/packages/backend/src/core/RemoteUserResolveService.ts
+++ b/packages/backend/src/core/RemoteUserResolveService.ts
@@ -35,7 +35,7 @@ export class RemoteUserResolveService {
@bindThis
public async resolveUser(username: string, host: string | null): Promise<LocalUser | RemoteUser> {
const usernameLower = username.toLowerCase();
-
+
if (host == null) {
this.logger.info(`return local user: ${usernameLower}`);
return await this.usersRepository.findOneBy({ usernameLower, host: IsNull() }).then(u => {
@@ -46,9 +46,9 @@ export class RemoteUserResolveService {
}
}) as LocalUser;
}
-
+
host = this.utilityService.toPuny(host);
-
+
if (this.config.host === host) {
this.logger.info(`return local user: ${usernameLower}`);
return await this.usersRepository.findOneBy({ usernameLower, host: IsNull() }).then(u => {
@@ -59,39 +59,39 @@ export class RemoteUserResolveService {
}
}) as LocalUser;
}
-
+
const user = await this.usersRepository.findOneBy({ usernameLower, host }) as RemoteUser | null;
-
+
const acctLower = `${usernameLower}@${host}`;
-
+
if (user == null) {
const self = await this.resolveSelf(acctLower);
-
+
this.logger.succ(`return new remote user: ${chalk.magenta(acctLower)}`);
return await this.apPersonService.createPerson(self.href);
}
-
+
// ユーザー情報が古い場合は、WebFilgerからやりなおして返す
if (user.lastFetchedAt == null || Date.now() - user.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) {
// 繋がらないインスタンスに何回も試行するのを防ぐ, 後続の同様処理の連続試行を防ぐ ため 試行前にも更新する
await this.usersRepository.update(user.id, {
lastFetchedAt: new Date(),
});
-
+
this.logger.info(`try resync: ${acctLower}`);
const self = await this.resolveSelf(acctLower);
-
+
if (user.uri !== self.href) {
// if uri mismatch, Fix (user@host <=> AP's Person id(RemoteUser.uri)) mapping.
this.logger.info(`uri missmatch: ${acctLower}`);
this.logger.info(`recovery missmatch uri for (username=${username}, host=${host}) from ${user.uri} to ${self.href}`);
-
+
// validate uri
const uri = new URL(self.href);
if (uri.hostname !== host) {
throw new Error('Invalid uri');
}
-
+
await this.usersRepository.update({
usernameLower,
host: host,
@@ -101,9 +101,9 @@ export class RemoteUserResolveService {
} else {
this.logger.info(`uri is fine: ${acctLower}`);
}
-
+
await this.apPersonService.updatePerson(self.href);
-
+
this.logger.info(`return resynced remote user: ${acctLower}`);
return await this.usersRepository.findOneBy({ uri: self.href }).then(u => {
if (u == null) {
@@ -113,7 +113,7 @@ export class RemoteUserResolveService {
}
});
}
-
+
this.logger.info(`return existing remote user: ${acctLower}`);
return user;
}