diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-04-21 06:52:28 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-04-21 06:52:28 +0900 |
| commit | 575cf2935e8b8a392a4c0d7404892e823fe7bbe8 (patch) | |
| tree | ec8db78a24d9a0c92162001b0ceeb2cf9c011516 /src | |
| parent | Merge branch 'develop' (diff) | |
| parent | 11.2.1 (diff) | |
| download | misskey-575cf2935e8b8a392a4c0d7404892e823fe7bbe8.tar.gz misskey-575cf2935e8b8a392a4c0d7404892e823fe7bbe8.tar.bz2 misskey-575cf2935e8b8a392a4c0d7404892e823fe7bbe8.zip | |
Merge branch 'develop'
Diffstat (limited to 'src')
| -rw-r--r-- | src/misc/id/meid.ts | 2 | ||||
| -rw-r--r-- | src/remote/activitypub/models/person.ts | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/misc/id/meid.ts b/src/misc/id/meid.ts index d4dc73b4f1..30bbdf1698 100644 --- a/src/misc/id/meid.ts +++ b/src/misc/id/meid.ts @@ -22,5 +22,5 @@ function getRandom() { } export function genMeid(date: Date): string { - return 'f' + getTime(date.getTime()) + getRandom(); + return getTime(date.getTime()) + getRandom(); } diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts index c1c07c7bbf..aeffbeaf29 100644 --- a/src/remote/activitypub/models/person.ts +++ b/src/remote/activitypub/models/person.ts @@ -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, |