From e36491c169bb6a25692b14ab0a81e2d93302226f Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sun, 21 Apr 2019 23:57:44 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20=E3=83=AA=E3=83=A2=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AE=E4=BF=AE=E5=BE=A9?=
 =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=8C=E8=87=AA=E5=8B=95=E7=9A=84=E3=81=AB?=
 =?UTF-8?q?=E5=AE=9F=E8=A1=8C=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=20?=
 =?UTF-8?q?=E3=81=AA=E3=81=A9=20for=20v11=20(#4764)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix #4761

* Fix: updatePersonができない
---
 src/remote/activitypub/models/person.ts | 19 +++++++------------
 src/remote/resolve-user.ts              | 14 ++++++++++----
 src/server/api/endpoints/users/show.ts  |  7 -------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index aeffbeaf2..a40677dfc 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -271,11 +271,6 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 	}
 	//#endregion
 
-	// 繋がらないインスタンスに何回も試行するのを防ぐ, 後続の同様処理の連続試行を防ぐ ため 試行前にも更新する
-	await Users.update(exist.id, {
-		lastFetchedAt: new Date(),
-	});
-
 	if (resolver == null) resolver = new Resolver();
 
 	const object = hint || await resolver.resolve(uri) as any;
@@ -349,13 +344,13 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 		url: person.url,
 		fields,
 		description: person.summary ? fromHtml(person.summary) : null,
-		twitterUserId: services.twitter.userId,
-		twitterScreenName: services.twitter.screenName,
-		githubId: services.github.id,
-		githubLogin: services.github.login,
-		discordId: services.discord.id,
-		discordUsername: services.discord.username,
-		discordDiscriminator: services.discord.discriminator,
+		twitterUserId: services.twitter ? services.twitter.userId : null,
+		twitterScreenName: services.twitter ? services.twitter.screenName : null,
+		githubId: services.github ? services.github.id : null,
+		githubLogin: services.github ? services.github.login : null,
+		discordId: services.discord ? services.discord.id : null,
+		discordUsername: services.discord ? services.discord.username : null,
+		discordDiscriminator: services.discord ? services.discord.discriminator : null,
 	});
 
 	// ハッシュタグ更新
diff --git a/src/remote/resolve-user.ts b/src/remote/resolve-user.ts
index a4bfca842..0e2b88f05 100644
--- a/src/remote/resolve-user.ts
+++ b/src/remote/resolve-user.ts
@@ -37,7 +37,7 @@ export async function resolveUser(username: string, host: string | null, option?
 		});
 	}
 
-	const user = await Users.findOne({ usernameLower, host }, option);
+	const user = await Users.findOne({ usernameLower, host }, option) as IRemoteUser;
 
 	const acctLower = `${usernameLower}@${host}`;
 
@@ -48,14 +48,20 @@ export async function resolveUser(username: string, host: string | null, option?
 		return await createPerson(self.href);
 	}
 
-	if (resync) {
+	// resyncオプション OR ユーザー情報が古い場合は、WebFilgerからやりなおして返す
+	if (resync || user.lastFetchedAt == null || Date.now() - user.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) {
+		// 繋がらないインスタンスに何回も試行するのを防ぐ, 後続の同様処理の連続試行を防ぐ ため 試行前にも更新する
+		await Users.update(user.id, {
+			lastFetchedAt: new Date(),
+		});
+
 		logger.info(`try resync: ${acctLower}`);
 		const self = await resolveSelf(acctLower);
 
-		if ((user as IRemoteUser).uri !== self.href) {
+		if (user.uri !== self.href) {
 			// if uri mismatch, Fix (user@host <=> AP's Person id(IRemoteUser.uri)) mapping.
 			logger.info(`uri missmatch: ${acctLower}`);
-			logger.info(`recovery missmatch uri for (username=${username}, host=${host}) from ${(user as IRemoteUser).uri} to ${self.href}`);
+			logger.info(`recovery missmatch uri for (username=${username}, host=${host}) from ${user.uri} to ${self.href}`);
 
 			// validate uri
 			const uri = new URL(self.href);
diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts
index 46dc7341e..a401166c5 100644
--- a/src/server/api/endpoints/users/show.ts
+++ b/src/server/api/endpoints/users/show.ts
@@ -95,13 +95,6 @@ export default define(meta, async (ps, me) => {
 			throw new ApiError(meta.errors.noSuchUser);
 		}
 
-		// ユーザー情報更新
-		if (Users.isRemoteUser(user)) {
-			if (user.lastFetchedAt == null || Date.now() - user.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) {
-				resolveUser(user.username, user.host, { }, true);
-			}
-		}
-
 		return await Users.pack(user, me, {
 			detail: true
 		});