Refactor

3 files changed, 11 insertions, 11 deletions

diff --git a/src/common/remote/activitypub/renderer/follow.ts b/src/common/remote/activitypub/renderer/follow.ts
index 05c0ecca06..86a3f8cede 100644
--- a/src/common/remote/activitypub/renderer/follow.ts
+++ b/src/common/remote/activitypub/renderer/follow.ts
@@ -1,8 +1,8 @@
 import config from '../../../../conf';
-import { IRemoteAccount } from '../../../../models/user';
+import { IRemoteUser } from '../../../../models/user';
 
-export default ({ username }, { account }) => ({
+export default ({ username }, followee: IRemoteUser) => ({
 	type: 'Follow',
 	actor: `${config.url}/@${username}`,
-	object: (account as IRemoteAccount).uri
+	object: followee.account.uri
 });
diff --git a/src/common/remote/activitypub/renderer/key.ts b/src/common/remote/activitypub/renderer/key.ts
index 692c71f88e..3cac86b769 100644
--- a/src/common/remote/activitypub/renderer/key.ts
+++ b/src/common/remote/activitypub/renderer/key.ts
@@ -1,10 +1,10 @@
 import config from '../../../../conf';
 import { extractPublic } from '../../../../crypto_key';
-import { ILocalAccount } from '../../../../models/user';
+import { ILocalUser } from '../../../../models/user';
 
-export default ({ username, account }) => ({
-	id: `${config.url}/@${username}/publickey`,
+export default (user: ILocalUser) => ({
+	id: `${config.url}/@${user.username}/publickey`,
 	type: 'Key',
-	owner: `${config.url}/@${username}`,
-	publicKeyPem: extractPublic((account as ILocalAccount).keypair)
+	owner: `${config.url}/@${user.username}`,
+	publicKeyPem: extractPublic(user.account.keypair)
 });
diff --git a/src/common/user/get-summary.ts b/src/common/user/get-summary.ts
index 47592c86ba..2c71d3eae9 100644
--- a/src/common/user/get-summary.ts
+++ b/src/common/user/get-summary.ts
@@ -1,4 +1,4 @@
-import { ILocalAccount, IUser } from '../../models/user';
+import { IUser, isLocalUser } from '../../models/user';
 import getAcct from './get-acct';
 
 /**
@@ -9,8 +9,8 @@ export default function(user: IUser): string {
 	let string = `${user.name} (@${getAcct(user)})\n` +
 		`${user.postsCount}投稿、${user.followingCount}フォロー、${user.followersCount}フォロワー\n`;
 
-	if (user.host === null) {
-		const account = user.account as ILocalAccount;
+	if (isLocalUser(user)) {
+		const account = user.account;
 		string += `場所: ${account.profile.location}、誕生日: ${account.profile.birthday}\n`;
 	}