From f8be57e3599890348aafbad83d0c059f762e7005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AD=B1=E5=82=91?= <jie65535@qq.com>
Date: Mon, 12 Feb 2024 22:21:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=91=E5=8D=A0=E4=BD=8D=E7=AC=A6?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                       |  6 ++----
 src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt | 12 ++++--------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index ec2a4af..e595523 100644
--- a/README.md
+++ b/README.md
@@ -28,11 +28,9 @@ MiraiConsolePlugin 自定义戳一戳回复消息
 
 ## 占位符
 
-- `{cardName}` 会被替换为群名片或昵称
-- `{nickName}` 会被替换为用户昵称`
+- `{name}` 会被替换为群名片或昵称
+- `{botName}` 会被替换为机器人群名片或昵称
 - `{groupName}` 会被替换为群名称
-- `{botCardName}` 会被替换为机器人群名片或昵称
-- `{botNickName}` 会被替换为机器人昵称
 - 更多欢迎 ISSUE 或者 PR 补充...
 
 ## 配置文件
diff --git a/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt b/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt
index 4aa9bef..a61da7f 100644
--- a/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt
+++ b/src/main/kotlin/top/jie65535/jnr/JNudgeReply.kt
@@ -182,17 +182,13 @@ object JNudgeReply : KotlinPlugin(
             } else if (it is PlainText) {
                 /**
                  * 占位符
-                 * - `{cardName}` 会被替换为群名片或昵称
-                 * - `{nickName}` 会被替换为用户昵称`
+                 * - `{name}` 会被替换为群名片或昵称
+                 * - `{botName}` 会被替换为机器人群名片或昵称
                  * - `{groupName}` 会被替换为群名称
-                 * - `{botCardName}` 会被替换为机器人群名片或昵称
-                 * - `{botNickName}` 会被替换为机器人昵称
                  */
                 val content = it.content
-                    .replace("{cardName}", event.from.nameCardOrNick)
-                    .replace("{nickName}", event.from.nick)
-                    .replace("{botCardName}", event.target.nameCardOrNick)
-                    .replace("{botNickName}", event.target.nick)
+                    .replace("{name}", event.from.nameCardOrNick)
+                    .replace("{botName}", event.target.nameCardOrNick)
                     .replace(
                         "{groupName}",
                         if (event.subject is Group) {