From bc1c115de47a28fc31a4ea40f01a682d19f443be Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 2 Sep 2020 20:51:56 +0900
Subject: [PATCH] :v:

---
 src/ai.ts                     | 2 +-
 src/modules/kazutori/index.ts | 5 ++++-
 src/serifs.ts                 | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ai.ts b/src/ai.ts
index 582a9bd..d131db6 100644
--- a/src/ai.ts
+++ b/src/ai.ts
@@ -296,7 +296,7 @@ export default class 藍 {
 	}
 
 	@autobind
-	public lookupFriend(userId: User['id']): Friend {
+	public lookupFriend(userId: User['id']): Friend | null {
 		const doc = this.friends.findOne({
 			userId: userId
 		});
diff --git a/src/modules/kazutori/index.ts b/src/modules/kazutori/index.ts
index c7d88d4..3cd3033 100644
--- a/src/modules/kazutori/index.ts
+++ b/src/modules/kazutori/index.ts
@@ -195,8 +195,11 @@ export default class extends Module {
 			}
 		}
 
+		const winnerFriend = winner ? this.ai.lookupFriend(winner.id) : null;
+		const name = winnerFriend ? winnerFriend.name : null;
+
 		const text = results.join('\n') + '\n\n' + (winner
-			? serifs.kazutori.finishWithWinner(acct(winner))
+			? serifs.kazutori.finishWithWinner(acct(winner), name)
 			: serifs.kazutori.finishWithNoWinner);
 
 		this.ai.post({
diff --git a/src/serifs.ts b/src/serifs.ts
index 642e4d1..20da348 100644
--- a/src/serifs.ts
+++ b/src/serifs.ts
@@ -301,7 +301,7 @@ export default {
 
 		finish: 'ゲームの結果発表です！',
 
-		finishWithWinner: user => `今回は${user}さんの勝ちです！またやりましょう♪`,
+		finishWithWinner: (user, name) => name ? `今回は${user}(${name})さんの勝ちです！またやりましょう♪` : `今回は${user}さんの勝ちです！またやりましょう♪`,
 
 		finishWithNoWinner: '今回は勝者はいませんでした... またやりましょう♪',