From 68ce6d574882c1badbb4a3d2772451534014dd01 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <nekomanma@pixiv.co.jp>
Date: Tue, 27 Mar 2018 16:51:12 +0900
Subject: Implement remote account resolution

---
 src/common/get-user-summary.ts | 12 ------------
 src/common/user/get-acct.ts    |  3 +++
 src/common/user/get-summary.ts | 18 ++++++++++++++++++
 src/common/user/parse-acct.ts  |  4 ++++
 4 files changed, 25 insertions(+), 12 deletions(-)
 delete mode 100644 src/common/get-user-summary.ts
 create mode 100644 src/common/user/get-acct.ts
 create mode 100644 src/common/user/get-summary.ts
 create mode 100644 src/common/user/parse-acct.ts

(limited to 'src/common')

diff --git a/src/common/get-user-summary.ts b/src/common/get-user-summary.ts
deleted file mode 100644
index 619814e8a8..0000000000
--- a/src/common/get-user-summary.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { IUser } from '../api/models/user';
-
-/**
- * ユーザーを表す文字列を取得します。
- * @param user ユーザー
- */
-export default function(user: IUser): string {
-	return `${user.name} (@${user.username})\n` +
-		`${user.posts_count}投稿、${user.following_count}フォロー、${user.followers_count}フォロワー\n` +
-		`場所: ${user.account.profile.location}、誕生日: ${user.account.profile.birthday}\n` +
-		`「${user.description}」`;
-}
diff --git a/src/common/user/get-acct.ts b/src/common/user/get-acct.ts
new file mode 100644
index 0000000000..9afb03d88b
--- /dev/null
+++ b/src/common/user/get-acct.ts
@@ -0,0 +1,3 @@
+export default user => {
+	return user.host === null ? user.username : `${user.username}@${user.host}`;
+};
diff --git a/src/common/user/get-summary.ts b/src/common/user/get-summary.ts
new file mode 100644
index 0000000000..f9b7125e30
--- /dev/null
+++ b/src/common/user/get-summary.ts
@@ -0,0 +1,18 @@
+import { ILocalAccount, IUser } from '../../api/models/user';
+import getAcct from './get-acct';
+
+/**
+ * ユーザーを表す文字列を取得します。
+ * @param user ユーザー
+ */
+export default function(user: IUser): string {
+	let string = `${user.name} (@${getAcct(user)})\n` +
+		`${user.posts_count}投稿、${user.following_count}フォロー、${user.followers_count}フォロワー\n`;
+
+	if (user.host === null) {
+		const account = user.account as ILocalAccount;
+		string += `場所: ${account.profile.location}、誕生日: ${account.profile.birthday}\n`;
+	}
+
+	return string + `「${user.description}」`;
+}
diff --git a/src/common/user/parse-acct.ts b/src/common/user/parse-acct.ts
new file mode 100644
index 0000000000..ef1f55405d
--- /dev/null
+++ b/src/common/user/parse-acct.ts
@@ -0,0 +1,4 @@
+export default acct => {
+	const splitted = acct.split('@', 2);
+	return { username: splitted[0], host: splitted[1] || null };
+};
-- 
cgit v1.2.3-freya