From 5d5535ed6e32c43c91c5f46ec4aae7f5f554ffda Mon Sep 17 00:00:00 2001
From: zyc404 <zyc404@gmail.com>
Date: Sun, 8 Oct 2023 18:34:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtrss=E4=B8=8D=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81sendPrivateMsg=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/index.js        | 14 +++++++++++---
 server/modules/user.js |  6 +++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/server/index.js b/server/index.js
index 56da027..3651d1d 100644
--- a/server/index.js
+++ b/server/index.js
@@ -118,7 +118,11 @@ async function mediaLink() {
             case 'register':
               if (data.state) {
                 let master = (await getMasterQQ())[0]
-                Bot.sendPrivateMsg(master, `当前chatgpt插件服务无法被外网访问，已启用代理链接，访问代码：${data.token}`, false)
+                if (Array.isArray(Bot.uin)) {
+                  Bot.pickFriend(master).sendMsg(`当前chatgpt插件服务无法被外网访问，已启用代理链接，访问代码：${data.token}`)
+                } else {
+                  Bot.sendPrivateMsg(master, `当前chatgpt插件服务无法被外网访问，已启用代理链接，访问代码：${data.token}`, false)
+                }
               } else {
                 console.log('注册区域失败')
               }
@@ -189,7 +193,7 @@ export async function createServer() {
     if (body.code) {
       const pattern = /^[a-zA-Z0-9]+$/
       if (!pattern.test(body.code)) {
-        reply.send({error: 'bad request'})
+        reply.send({ error: 'bad request' })
       }
       const dir = 'resources/ChatGPTCache/page'
       const filename = body.code + '.json'
@@ -342,7 +346,11 @@ export async function createServer() {
               if (data.group) {
                 Bot.sendGroupMsg(parseInt(data.id), data.message, data.quotable)
               } else {
-                Bot.sendPrivateMsg(parseInt(data.id), data.message, data.quotable)
+                if (Array.isArray(Bot.uin)) {
+                  Bot.pickFriend(parseInt(data.id)).sendMsg(data.message)
+                } else {
+                  Bot.sendPrivateMsg(parseInt(data.id), data.message, data.quotable)
+                }
               }
               await connection.socket.send(JSON.stringify({ command: data.command, state: true, }))
             } else {
diff --git a/server/modules/user.js b/server/modules/user.js
index a781a6b..7458805 100644
--- a/server/modules/user.js
+++ b/server/modules/user.js
@@ -46,7 +46,11 @@ async function User(fastify, options) {
             { EX: 60000 }
         )
         const master = (await getMasterQQ())[0]
-        Bot.sendPrivateMsg(master, `收到工具箱快捷登录请求，1分钟内有效：${otp}`, false)
+        if (Array.isArray(Bot.uin)) {
+            Bot.pickFriend(master).sendMsg(`收到工具箱快捷登录请求，1分钟内有效：${otp}`)
+        } else {
+            Bot.sendPrivateMsg(master, `收到工具箱快捷登录请求，1分钟内有效：${otp}`, false)
+        }
         reply.send({ state: true })
         return reply
     })