From 92316e1df1a24e2f93fe0c8af7976cb74a67c6d3 Mon Sep 17 00:00:00 2001
From: yeyang <746659424@qq.com>
Date: Sun, 18 Dec 2022 21:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/handle.js               | 14 +++++++-------
 apps/pixiv.js                |  2 +-
 apps/request.js              |  2 +-
 config/system/help_system.js |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/handle.js b/apps/handle.js
index bfebb60..898f960 100644
--- a/apps/handle.js
+++ b/apps/handle.js
@@ -15,10 +15,6 @@ export class anotice extends plugin {
             event: 'message',
             priority: 500,
             rule: [
-                {
-                    reg: '^#?(同意|拒绝)申请.*$',
-                    fnc: 'agree'
-                },
                 {
                     reg: '^#?(同意|拒绝)$',
                     fnc: 'agrees'
@@ -27,6 +23,10 @@ export class anotice extends plugin {
                     reg: '^#?回复.*$',
                     fnc: 'Replys'
                 },
+                {
+                    reg: '^#?(同意|拒绝)好友申请.*$',
+                    fnc: 'agree'
+                },
                 {
                     reg: '^#(同意|拒绝)全部好友申请$',
                     fnc: 'agreesAll'
@@ -59,7 +59,7 @@ export class anotice extends plugin {
     async agree(e) {
         if (!e.isMaster) return
         let yes = /同意/.test(e.msg) ? true : false
-        let qq = e.message[0].text.replace(/#|(同意|拒绝)申请/g, '').trim()
+        let qq = e.message[0].text.replace(/#|(同意|拒绝)好友申请/g, '').trim()
         if (e.message[1]) {
             qq = e.message[1].qq
         } else {
@@ -101,7 +101,7 @@ export class anotice extends plugin {
             })
             let msg = [
                 `现有未处理的好友申请如下，共${FriendAdd.length}条`,
-                `可用"同意申请xxx"或"拒绝申请xxx"`,
+                `可用"#同意好友申请<QQ>"或"#拒绝好友申请<QQ>"进行处理`,
                 ...FriendAdd
             ];
             return Cfg.getforwardMsg(e, msg)
@@ -168,7 +168,7 @@ export class anotice extends plugin {
                 .then(() => e.reply(`✅ 已${yes ? '同意' : '拒绝'}${qq}的群邀请`))
                 .catch(() => e.reply('❎ 请检查是否已同意该邀请'))
         } else {
-            e.reply('❎ 请检查是否引用正确')
+            return false;
         }
     }
 
diff --git a/apps/pixiv.js b/apps/pixiv.js
index e52ea47..4b45780 100644
--- a/apps/pixiv.js
+++ b/apps/pixiv.js
@@ -10,7 +10,7 @@ let listreg = new RegExp(`^#?看看((\\d{4}-\\d{1,2}-\\d{1,2})的)?(${Object.key
 let tagreg = new RegExp('^#?tag(pro)?搜图(.*)$', "i")
 let pidreg = new RegExp('^#?pid搜图\\s?(\\d+)$', "i")
 let uidreg = new RegExp('^#?uid搜图(.*)$', "i")
-let randomimgreg = new RegExp(`^#?来(${Numreg})?张(好(康|看)(的|哒)|hkd|涩图)|#有内鬼$`)
+let randomimgreg = new RegExp(`^#?来(${Numreg})?张(好(康|看)(的|哒)|hkd|涩图)$|#有内鬼$`)
 let relatedreg = new RegExp(`^#?看?看?相关作品(\\d+)$`);
 export class example extends plugin {
     constructor() {
diff --git a/apps/request.js b/apps/request.js
index 662d89b..49b17eb 100644
--- a/apps/request.js
+++ b/apps/request.js
@@ -60,7 +60,7 @@ Bot.on('request.friend', async (e) => {
         msg.push('已自动同意该好友申请')
     } else {
         msg.push(
-            `-------------\n可回复：同意申请${e.user_id} \n或引用该消息回复"同意"或"拒绝"`
+            `-------------\n可回复：#同意好友申请${e.user_id} \n或引用该消息回复"同意"或"拒绝"`
         )
     }
     await xcfg.getSend(msg)
diff --git a/config/system/help_system.js b/config/system/help_system.js
index 9254d4c..61e3e56 100644
--- a/config/system/help_system.js
+++ b/config/system/help_system.js
@@ -130,7 +130,7 @@ export const helpList = [{
     "icon": 1
   },
   {
-    "title": "同意|拒绝申请 <QQ>",
+    "title": "同意|拒绝好友申请 <QQ>",
     "desc": "同意或拒绝好友申请",
     "icon": 18
   },