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

Merge branch 'develop'

Browse Source
This commit is contained in:
syuilo
2019-04-21 06:52:28 +09:00
parent 7b44727b23 ae43aa1bc0
commit 575cf2935e
5 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/misc/id/meid.ts
View File

@ -22,5 +22,5 @@ function getRandom() {
}
export function genMeid(date: Date): string {
return 'f' + getTime(date.getTime()) + getRandom();
return getTime(date.getTime()) + getRandom();
}

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

@ -318,11 +318,7 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
sharedInbox: person.sharedInbox || (person.endpoints ? person.endpoints.sharedInbox : undefined),
featured: person.featured,
emojis: emojiNames,
description: person.summary ? fromHtml(person.summary) : null,
name: person.name,
url: person.url,
endpoints: person.endpoints,
fields,
tags,
isBot: object.type == 'Service',
isCat: (person as any).isCat === true,
@ -350,6 +346,9 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint
});
await UserProfiles.update({ userId: exist.id }, {
url: person.url,
fields,
description: person.summary ? fromHtml(person.summary) : null,
twitterUserId: services.twitter.userId,
twitterScreenName: services.twitter.screenName,
githubId: services.github.id,