sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve #1669

Browse Source
This commit is contained in:
syuilo
2020-02-01 07:16:52 +09:00
parent d355f3f77c
commit 7ed3448e13
19 changed files with 152 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/remote/activitypub/models/person.ts
View File

@ -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,
});
// ハッシュタグ更新

39
src/remote/activitypub/renderer/person.ts
View File

@ -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));