From a95546ede0e42d9c04a1035156222f6bb5e52319 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 19 Apr 2019 01:00:17 +0900 Subject: Fix bug --- src/remote/activitypub/models/person.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts index c1c07c7bbf..37d9508252 100644 --- a/src/remote/activitypub/models/person.ts +++ b/src/remote/activitypub/models/person.ts @@ -318,11 +318,9 @@ 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 +348,8 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint }); await UserProfiles.update({ userId: exist.id }, { + fields, + description: person.summary ? fromHtml(person.summary) : null, twitterUserId: services.twitter.userId, twitterScreenName: services.twitter.screenName, githubId: services.github.id, -- cgit v1.2.3-freya From 2934b093614d885f926eb3938c7065e7a8239720 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 19 Apr 2019 21:37:36 +0900 Subject: Fix bug --- src/remote/activitypub/models/person.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts index 37d9508252..aeffbeaf29 100644 --- a/src/remote/activitypub/models/person.ts +++ b/src/remote/activitypub/models/person.ts @@ -319,8 +319,6 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint featured: person.featured, emojis: emojiNames, name: person.name, - url: person.url, - endpoints: person.endpoints, tags, isBot: object.type == 'Service', isCat: (person as any).isCat === true, @@ -348,6 +346,7 @@ 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, -- cgit v1.2.3-freya From 0ba71c6a4761569913583bd5babfcb6275bc0410 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sun, 21 Apr 2019 02:30:18 +0900 Subject: Fix #4752 (#4759) --- src/misc/id/meid.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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(); } -- cgit v1.2.3-freya