From b777b3412682704084e53b69dbbaa30842de82fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=94=E9=9F=B3=E5=B9=BB=E7=A6=BB?= <florwa_natat@qq.com>
Date: Thu, 10 Oct 2024 01:45:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(dish):=20=E4=BF=AE=E5=A4=8D=E5=AE=A2?=
 =?UTF-8?q?=E5=AE=98=E5=90=8D=E6=98=BE=E7=A4=BA=E4=B8=BA=E8=8F=9C=E5=90=8D?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20(#1000)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(dish): 修复客官名显示为菜名的问题
去除了多余的换行

* optimize(dish): 去除不必要的 fmt.Sprintf
---
 plugin/dish/dish.go | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/plugin/dish/dish.go b/plugin/dish/dish.go
index 6fd99858..78b1c8f7 100644
--- a/plugin/dish/dish.go
+++ b/plugin/dish/dish.go
@@ -62,7 +62,7 @@ func init() {
 			return
 		}
 
-		name := ctx.NickName()
+		name := ctx.CardOrNickName(ctx.Event.UserID)
 		dishName := ctx.State["args"].(string)
 
 		if dishName == "" {
@@ -82,12 +82,10 @@ func init() {
 			return
 		}
 
-		ctx.SendChain(message.Text(fmt.Sprintf(
-			"已为客官%s找到%s的做法辣！\n"+
-				"原材料：%s\n"+
-				"步骤：\n"+
-				"%s",
-			name, d.Name, d.Materials, d.Steps),
+		ctx.SendChain(message.Text(
+			"已为客官", name, "找到", d.Name, "的做法辣！\n",
+			"原材料：", d.Materials, "\n",
+			"步骤：", d.Steps,
 		))
 	})
 
@@ -105,12 +103,10 @@ func init() {
 			return
 		}
 
-		ctx.SendChain(message.Text(fmt.Sprintf(
-			"已为客官%s送上%s的做法：\n"+
-				"原材料：%s\n"+
-				"步骤：\n"+
-				"%s",
-			name, d.Name, d.Materials, d.Steps),
+		ctx.SendChain(message.Text(
+			"已为客官", name, "送上", d.Name, "的做法：\n",
+			"原材料：", d.Materials, "\n",
+			"步骤：", d.Steps,
 		))
 	})
 }