From 7ed3448e13847f3ba807be1354e90c912fbefd9a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 1 Feb 2020 07:16:52 +0900
Subject: Resolve #1669

---
 src/remote/activitypub/models/person.ts   |  9 +------
 src/remote/activitypub/renderer/person.ts | 39 -------------------------------
 2 files changed, 1 insertion(+), 47 deletions(-)

(limited to 'src/remote')

diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index 6fad553c91..f9ffa4d77a 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -306,7 +306,7 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 
 	const emojiNames = emojis.map(emoji => emoji.name);
 
-	const { fields, services } = analyzeAttachments(person.attachment || []);
+	const { fields } = analyzeAttachments(person.attachment || []);
 
 	const tags = extractHashtags(person.tag).map(tag => tag.toLowerCase()).splice(0, 32);
 
@@ -347,13 +347,6 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
 		url: person.url,
 		fields,
 		description: person.summary ? fromHtml(person.summary) : null,
-		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/activitypub/renderer/person.ts b/src/remote/activitypub/renderer/person.ts
index 07a0eeed42..af0e446ac1 100644
--- a/src/remote/activitypub/renderer/person.ts
+++ b/src/remote/activitypub/renderer/person.ts
@@ -39,45 +39,6 @@ export async function renderPerson(user: ILocalUser) {
 		}
 	}
 
-	if (profile.twitter) {
-		attachment.push({
-			type: 'PropertyValue',
-			name: 'Twitter',
-			value: `<a href="https://twitter.com/intent/user?user_id=${profile.twitterUserId}" rel="me nofollow noopener" target="_blank"><span>@${profile.twitterScreenName}</span></a>`,
-			identifier: {
-				type: 'PropertyValue',
-				name: 'misskey:authentication:twitter',
-				value: `${profile.twitterUserId}@${profile.twitterScreenName}`
-			}
-		});
-	}
-
-	if (profile.github) {
-		attachment.push({
-			type: 'PropertyValue',
-			name: 'GitHub',
-			value: `<a href="https://github.com/${profile.githubLogin}" rel="me nofollow noopener" target="_blank"><span>@${profile.githubLogin}</span></a>`,
-			identifier: {
-				type: 'PropertyValue',
-				name: 'misskey:authentication:github',
-				value: `${profile.githubId}@${profile.githubLogin}`
-			}
-		});
-	}
-
-	if (profile.discord) {
-		attachment.push({
-			type: 'PropertyValue',
-			name: 'Discord',
-			value: `<a href="https://discordapp.com/users/${profile.discordId}" rel="me nofollow noopener" target="_blank"><span>${profile.discordUsername}#${profile.discordDiscriminator}</span></a>`,
-			identifier: {
-				type: 'PropertyValue',
-				name: 'misskey:authentication:discord',
-				value: `${profile.discordId}@${profile.discordUsername}#${profile.discordDiscriminator}`
-			}
-		});
-	}
-
 	const emojis = await getEmojis(user.emojis);
 	const apemojis = emojis.map(emoji => renderEmoji(emoji));
 
-- 
cgit v1.2.3-freya