From 5ddb047794bb3aaef250c15dfbae56872faedfd9 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 8 Apr 2018 05:02:50 +0900
Subject: Fix bugs

---
 src/remote/activitypub/renderer/follow.ts |  6 +++---
 src/remote/activitypub/resolve-person.ts  | 12 +++++-------
 src/remote/request.ts                     |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/remote')

diff --git a/src/remote/activitypub/renderer/follow.ts b/src/remote/activitypub/renderer/follow.ts
index 0a1ae1a4b2..89993d9458 100644
--- a/src/remote/activitypub/renderer/follow.ts
+++ b/src/remote/activitypub/renderer/follow.ts
@@ -1,8 +1,8 @@
 import config from '../../../config';
-import { IRemoteUser } from '../../../models/user';
+import { IRemoteUser, ILocalUser } from '../../../models/user';
 
-export default ({ username }, followee: IRemoteUser) => ({
+export default (follower: ILocalUser, followee: IRemoteUser) => ({
 	type: 'Follow',
-	actor: `${config.url}/@${username}`,
+	actor: `${config.url}/@${follower.username}`,
 	object: followee.uri
 });
diff --git a/src/remote/activitypub/resolve-person.ts b/src/remote/activitypub/resolve-person.ts
index ac0900307f..ddb8d68715 100644
--- a/src/remote/activitypub/resolve-person.ts
+++ b/src/remote/activitypub/resolve-person.ts
@@ -66,14 +66,12 @@ export default async (value, verifier?: string) => {
 		usernameLower: object.preferredUsername.toLowerCase(),
 		host,
 		hostLower,
-		account: {
-			publicKey: {
-				id: object.publicKey.id,
-				publicKeyPem: object.publicKey.publicKeyPem
-			},
-			inbox: object.inbox,
-			uri: id,
+		publicKey: {
+			id: object.publicKey.id,
+			publicKeyPem: object.publicKey.publicKeyPem
 		},
+		inbox: object.inbox,
+		uri: id
 	});
 
 	const [avatarId, bannerId] = (await Promise.all([
diff --git a/src/remote/request.ts b/src/remote/request.ts
index a0c69cf4ef..81e7c05c73 100644
--- a/src/remote/request.ts
+++ b/src/remote/request.ts
@@ -8,7 +8,7 @@ import { ILocalUser } from '../models/user';
 
 const log = debug('misskey:activitypub:deliver');
 
-export default (user: ILocalUser, url, object) => new Promise((resolve, reject) => {
+export default (user: ILocalUser, url: string, object) => new Promise((resolve, reject) => {
 	log(`--> ${url}`);
 
 	const { protocol, hostname, port, pathname, search } = new URL(url);
-- 
cgit v1.2.3-freya