From e2f7e82cac65938b6d494aceb5c1c1fc3fbe865e Mon Sep 17 00:00:00 2001
From: "Acid Chicken (硫酸鶏)" <root@acid-chicken.com>
Date: Thu, 24 Jan 2019 17:33:39 +0900
Subject: 外部サービス認証情報の配信 (#3975)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update person.ts

* Update person.ts

* Update person.ts

* Update person.ts

* Create original model

* Make type formal

* Update person.ts

* Follow @mei23's review

refs: https://github.com/syuilo/misskey/pull/3975#pullrequestreview-195770172
---
 src/remote/activitypub/renderer/person.ts | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'src/remote/activitypub/renderer')

diff --git a/src/remote/activitypub/renderer/person.ts b/src/remote/activitypub/renderer/person.ts
index aaf78444d4..096596b021 100644
--- a/src/remote/activitypub/renderer/person.ts
+++ b/src/remote/activitypub/renderer/person.ts
@@ -7,6 +7,7 @@ import parse from '../../../mfm/parse';
 import DriveFile from '../../../models/drive-file';
 import { getEmojis } from './note';
 import renderEmoji from './emoji';
+import { IIdentifier } from '../models/identifier';
 
 export default async (user: ILocalUser) => {
 	const id = `${config.url}/users/${user._id}`;
@@ -20,14 +21,20 @@ export default async (user: ILocalUser) => {
 		type: string,
 		name: string,
 		value: string,
-		verified_at?: string
+		verified_at?: string,
+		identifier?: IIdentifier
 	}[] = [];
 
 	if (user.twitter) {
 		attachment.push({
 			type: 'PropertyValue',
 			name: 'Twitter',
-			value: `<a href="https://twitter.com/intent/user?user_id=${user.twitter.userId}" rel="me nofollow noopener" target="_blank"><span>@${user.twitter.screenName}</span></a>`
+			value: `<a href="https://twitter.com/intent/user?user_id=${user.twitter.userId}" rel="me nofollow noopener" target="_blank"><span>@${user.twitter.screenName}</span></a>`,
+			identifier: {
+				type: 'PropertyValue',
+				name: 'misskey:authentication:twitter',
+				value: `${user.twitter.userId}@${user.twitter.screenName}`
+			}
 		});
 	}
 
@@ -35,7 +42,12 @@ export default async (user: ILocalUser) => {
 		attachment.push({
 			type: 'PropertyValue',
 			name: 'GitHub',
-			value: `<a href="https://github.com/${user.github.login}" rel="me nofollow noopener" target="_blank"><span>@${user.github.login}</span></a>`
+			value: `<a href="https://github.com/${user.github.login}" rel="me nofollow noopener" target="_blank"><span>@${user.github.login}</span></a>`,
+			identifier: {
+				type: 'PropertyValue',
+				name: 'misskey:authentication:github',
+				value: `${user.github.id}@${user.github.login}`
+			}
 		});
 	}
 
@@ -43,7 +55,12 @@ export default async (user: ILocalUser) => {
 		attachment.push({
 			type: 'PropertyValue',
 			name: 'Discord',
-			value: `<a href="https://discordapp.com/users/${user.discord.id}" rel="me nofollow noopener" target="_blank"><span>${user.discord.username}#${user.discord.discriminator}</span></a>`
+			value: `<a href="https://discordapp.com/users/${user.discord.id}" rel="me nofollow noopener" target="_blank"><span>${user.discord.username}#${user.discord.discriminator}</span></a>`,
+			identifier: {
+				type: 'PropertyValue',
+				name: 'misskey:authentication:discord',
+				value: `${user.discord.id}@${user.discord.username}#${user.discord.discriminator}`
+			}
 		});
 	}
 
-- 
cgit v1.2.3-freya