From b6889e9ac6c5b3c3b51b3bdf7ec1fc20b4a07da8 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 8 Apr 2019 00:46:01 +0900
Subject: [PATCH] Fix bug

---
 src/remote/activitypub/models/person.ts | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index 51a9efa10b..fbc329e860 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -159,18 +159,6 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 			isBot,
 			isCat: (person as any).isCat === true
 		} as Partial<User>) as IRemoteUser;
-
-		await UserPublickeys.save({
-			id: genId(),
-			userId: user.id,
-			keyId: person.publicKey.id,
-			keyPem: person.publicKey.publicKeyPem
-		} as UserPublickey);
-
-		await UserServiceLinkings.save({
-			id: genId(),
-			userId: user.id,
-		} as UserServiceLinking);
 	} catch (e) {
 		// duplicate key error
 		if (isDuplicateKeyValueError(e)) {
@@ -181,6 +169,13 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 		throw e;
 	}
 
+	await UserPublickeys.save({
+		id: genId(),
+		userId: user.id,
+		keyId: person.publicKey.id,
+		keyPem: person.publicKey.publicKeyPem
+	} as UserPublickey);
+
 	await UserServiceLinkings.save({
 		id: genId(),
 		userId: user.id