From 1563e49a252b47cb81790abf508a8b2071d29935 Mon Sep 17 00:00:00 2001
From: ikechan8370 <geyinchibuaa@gmail.com>
Date: Wed, 29 Mar 2023 11:21:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20at=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=A4=9A?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=97=E4=BA=86=E4=B8=80=E4=B8=AAat=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/chat.js            | 3 +++
 utils/SydneyAIClient.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/chat.js b/apps/chat.js
index effb5d0..c65a26a 100644
--- a/apps/chat.js
+++ b/apps/chat.js
@@ -514,6 +514,9 @@ export class chatgpt extends plugin {
       }
       if (e.user_id == Bot.uin) return false
       prompt = e.raw_message.trim()
+      let me = e.group.pickMember(Bot.uin)
+      let card = me.card || me.nickname
+      prompt = prompt.replace(`@${card}`, '').trim()
     } else {
       let ats = e.message.filter(m => m.type === 'at')
       if (!e.atme && ats.length > 0) {
diff --git a/utils/SydneyAIClient.js b/utils/SydneyAIClient.js
index 6a26008..a65c478 100644
--- a/utils/SydneyAIClient.js
+++ b/utils/SydneyAIClient.js
@@ -436,7 +436,7 @@ export default class SydneyAIClient {
         context += chats
           .map(chat => {
             let sender = chat.sender
-            return `${sender.card} （qq：${sender.user_id}，群角色 ${roleMap[sender.role] || '普通成员'}，${sender.area ? '来自' + sender.area + '，' : ''} ${sender.age}岁， 群头衔：${sender.title}， 性别：${sender.sex}，时间：${formatDate(new Date(chat.time * 1000))}） 说：${chat.raw_message} 发言时间：\n`
+            return `【${sender.card}】（qq：${sender.user_id}，昵称：${sender.nickname}，群角色 ${roleMap[sender.role] || '普通成员'}，${sender.area ? '来自' + sender.area + '，' : ''} ${sender.age}岁， 群头衔：${sender.title}， 性别：${sender.sex}，时间：${formatDate(new Date(chat.time * 1000))}） 说：${chat.raw_message} 发言时间：\n`
           })
           .join('\n')
       }