summaryrefslogtreecommitdiff
path: root/src/server/common/user/get-summary.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
commitbfc193d8cd9aecdb82d585e8b4e101deac60a5bb (patch)
tree8b4dac3a56cf703650c8207f9279028a8560a96b /src/server/common/user/get-summary.ts
parentresolve conflict (diff)
downloadsharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.gz
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.bz2
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.zip
Resolve conflicts
Diffstat (limited to 'src/server/common/user/get-summary.ts')
-rw-r--r--src/server/common/user/get-summary.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/common/user/get-summary.ts b/src/server/common/user/get-summary.ts
index f9b7125e30..b314a5cefb 100644
--- a/src/server/common/user/get-summary.ts
+++ b/src/server/common/user/get-summary.ts
@@ -7,7 +7,7 @@ import getAcct from './get-acct';
*/
export default function(user: IUser): string {
let string = `${user.name} (@${getAcct(user)})\n` +
- `${user.posts_count}投稿、${user.following_count}フォロー、${user.followers_count}フォロワー\n`;
+ `${user.postsCount}投稿、${user.followingCount}フォロー、${user.followersCount}フォロワー\n`;
if (user.host === null) {
const account = user.account as ILocalAccount;