summaryrefslogtreecommitdiff
path: root/src/remote/activitypub
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-04-21 23:57:44 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-04-21 23:57:44 +0900
commita78475844a41e81a819457ae97752e4db3e994b5 (patch)
tree3a585c54ec333ec203370f2eed3b918711f8ab1f /src/remote/activitypub
parent11.2.1 (diff)
downloadmisskey-a78475844a41e81a819457ae97752e4db3e994b5.tar.gz
misskey-a78475844a41e81a819457ae97752e4db3e994b5.tar.bz2
misskey-a78475844a41e81a819457ae97752e4db3e994b5.zip
Fix: リモートユーザーの修復処理が自動的に実行されない など for v11 (#4764)
* Fix #4761 * Fix: updatePersonができない
Diffstat (limited to 'src/remote/activitypub')
-rw-r--r--src/remote/activitypub/models/person.ts19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index aeffbeaf29..a40677dfc3 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,
});
// ハッシュタグ更新