From 8036dd703b00fc8d1815bb9b3db77394920cb54d Mon Sep 17 00:00:00 2001
From: yeyang <746659424@qq.com>
Date: Sat, 8 Oct 2022 23:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A2=9E=E5=8A=A0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA=EF=BC=8C=20=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF/=E5=85=B3=E9=97=AD=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=A8=E9=83=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md              |  3 +--
 apps/handle.js         |  9 +++++++++
 apps/notice_friend.js  |  5 ++++-
 apps/notice_group.js   | 32 ++++++++++++++++++++++++++++++++
 apps/notice_message.js |  9 +++++++--
 apps/request_friend.js |  1 +
 apps/request_group.js  |  2 +-
 apps/set.js            |  7 ++++---
 8 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 542beb6..d7e888e 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,7 @@
   </a><br>
 
 
-
-<h1>Yenai-Plugin说明</h1>
+<h1>Yenai-Plugin</h1>
 
 Yenai-Plugin是一个Yunzai-Bot的升级插件，提供对bot的一些便携操作。<br><br><img src="https://count.getloli.com/get/@:yenai-plugin?theme=rule34" /> <br>
 
diff --git a/apps/handle.js b/apps/handle.js
index dd45fc7..789c60d 100644
--- a/apps/handle.js
+++ b/apps/handle.js
@@ -45,6 +45,7 @@ export class anotice extends plugin {
             e.reply('❎ 请输入正确的QQ号')
             return false
         }
+        logger.info("[椰奶]同意好友申请")
         await Bot.pickFriend(qq)
             .setFriendReq()
             .then(() => e.reply(`✅ 已同意${qq}的好友申请`))
@@ -72,6 +73,9 @@ export class anotice extends plugin {
         if (/申请人QQ/.test(res[1]) && /好友申请/.test(res[0])) {
             let qq = res[1].match(/[1-9]\d*/g)
             if (Bot.fl.get(Number(qq))) return e.reply('❎ 已经同意过该申请了哦~')
+
+            logger.info(`[椰奶]${yes ? '同意' : '拒绝'}好友申请`)
+
             Bot.pickFriend(qq)
                 .setFriendReq('', yes)
                 .then(() => e.reply(`✅ 已${yes ? '同意' : '拒绝'}${qq}的好友申请`))
@@ -86,6 +90,9 @@ export class anotice extends plugin {
 
             let qq = res[3].match(/[1-9]\d*/g)
             let seq = res[6].match(/[1-9]\d*/g)
+
+            logger.info(`[椰奶]${yes ? '同意' : '拒绝'}群邀请`)
+
             Bot.pickUser(qq)
                 .setGroupInvite(groupid, seq, yes)
                 .then(() => e.reply(`✅ 已${yes ? '同意' : '拒绝'}${qq}的群邀请`))
@@ -138,6 +145,8 @@ export class anotice extends plugin {
 
         if (e.message.length === 0) return e.reply('❎ 消息不能为空')
 
+        logger.info(`[椰奶]回复好友消息`)
+        
         Bot.pickFriend(qq)
             .sendMsg(e.message)
             .then(() => { e.reply('✅ 已把消息发给它了哦~') })
diff --git a/apps/notice_friend.js b/apps/notice_friend.js
index c349f14..09a1020 100644
--- a/apps/notice_friend.js
+++ b/apps/notice_friend.js
@@ -21,6 +21,7 @@ export class Friends extends plugin {
         switch (e.sub_type) {
             case 'increase': {
                 if (!await redis.get(`yenai:notice:friendNumberChange`)) return
+                logger.info("[椰奶]新增好友")
                 msg = [
                     segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`),
                     '[通知 - 新增好友]\n',
@@ -31,6 +32,7 @@ export class Friends extends plugin {
             }
             case 'decrease': {
                 if (!await redis.get(`yenai:notice:friendNumberChange`)) return
+                logger.info("[椰奶]好友减少")
                 msg = [
                     segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`),
                     '[通知 - 好友减少]\n',
@@ -45,7 +47,7 @@ export class Friends extends plugin {
                 if (e.user_id == cfg.qq) return
 
                 if (cfg.masterQQ.includes(e.user_id)) return
-
+                logger.info("[椰奶]好友撤回")
                 // 读取
                 let res = JSON.parse(
                     await redis.get(`notice:messagePrivate:${e.message_id}`)
@@ -82,6 +84,7 @@ export class Friends extends plugin {
             }
             case 'poke': {
                 if (!await redis.get(`yenai:notice:privateMessage`)) return
+                logger.info("[椰奶]好友戳一戳")
                 msg = [
                     segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`),
                     '[消息 - 戳一戳]\n',
diff --git a/apps/notice_group.js b/apps/notice_group.js
index 1ebc2cf..56d11d7 100644
--- a/apps/notice_group.js
+++ b/apps/notice_group.js
@@ -22,6 +22,9 @@ export class newgroups extends plugin {
             case 'increase': {
                 if (e.user_id === cfg.qq) {
                     if (!await redis.get(`yenai:notice:groupNumberChange`)) return
+
+                    logger.info("[椰奶]新增群聊")
+
                     msg = [
                         segment.image(
                             `https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`
@@ -31,6 +34,9 @@ export class newgroups extends plugin {
                     ]
                 } else {
                     if (!await redis.get(`yenai:notice:groupMemberNumberChange`)) return
+
+                    logger.info("[椰奶]新增群员")
+
                     msg = [
                         segment.image(
                             `https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`
@@ -46,6 +52,9 @@ export class newgroups extends plugin {
             case 'decrease': {
                 if (e.dismiss) {
                     if (!await redis.get(`yenai:notice:groupNumberChange`)) return
+
+                    logger.info("[椰奶]群聊被解散")
+
                     msg = [
                         segment.image(
                             `https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`
@@ -56,6 +65,9 @@ export class newgroups extends plugin {
                     ]
                 } else if (e.user_id === cfg.qq && e.operator_id !== cfg.qq) {
                     if (!await redis.get(`yenai:notice:groupNumberChange`)) return
+
+                    logger.info("[椰奶]机器人被踢")
+
                     msg = [
                         segment.image(
                             `https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`
@@ -67,6 +79,8 @@ export class newgroups extends plugin {
                 } else if (e.user_id === cfg.qq && e.operator_id === cfg.qq) {
                     if (!await redis.get(`yenai:notice:groupNumberChange`)) return
 
+                    logger.info("[椰奶]机器人退群")
+
                     msg = [
                         segment.image(
                             `https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`
@@ -77,6 +91,8 @@ export class newgroups extends plugin {
                 } else if (e.operator_id === e.user_id) {
                     if (!await redis.get(`yenai:notice:groupMemberNumberChange`)) return
 
+                    logger.info("[椰奶]群员退群")
+
                     msg = [
                         segment.image(
                             `https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`
@@ -94,6 +110,8 @@ export class newgroups extends plugin {
                 } else if (e.operator_id !== e.user_id) {
                     if (!await redis.get(`yenai:notice:groupMemberNumberChange`)) return
 
+                    logger.info("[椰奶]群员被踢")
+
                     msg = [
                         segment.image(
                             `https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`
@@ -116,7 +134,9 @@ export class newgroups extends plugin {
             case 'admin': {
                 if (!await redis.get(`yenai:notice:groupAdminChange`)) return
 
+                e.set ? logger.info("[椰奶]机器人被设置管理") : logger.info("[椰奶]机器人被取消管理")
                 if (e.user_id === cfg.qq) {
+
                     msg = [
                         segment.image(
                             `https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`
@@ -126,7 +146,11 @@ export class newgroups extends plugin {
                             : '[通知 - 机器人被取消管理]:\n',
                         `被操作群号：${e.group_id}`
                     ]
+
                 } else {
+
+                    e.set ? logger.info("[椰奶]新增群管理员") : logger.info("[椰奶]取消群管理员")
+
                     msg = [
                         segment.image(
                             `https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`
@@ -147,6 +171,7 @@ export class newgroups extends plugin {
                 if (e.user_id != cfg.qq) return
 
                 if (e.duration == 0) {
+                    logger.info("[椰奶]机器人被解除禁言")
                     msg = [
                         segment.image(
                             `https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`
@@ -156,6 +181,9 @@ export class newgroups extends plugin {
                         `处理群号：${e.group_id}`
                     ]
                 } else if (e.user_id === cfg.qq) {
+
+                    logger.info("[椰奶]机器人被禁言")
+
                     msg = [
                         segment.image(
                             `https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`
@@ -171,6 +199,9 @@ export class newgroups extends plugin {
             // 群转让
             case 'transfer': {
                 if (!await redis.get(`yenai:notice:groupNumberChange`)) return
+
+                logger.info("[椰奶]群聊转让")
+
                 msg = [
                     segment.image(
                         `https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`
@@ -236,6 +267,7 @@ export class newgroups extends plugin {
                     isManage = `撤回管理：${e.group.pickMember(e.operator_id).card}(${e.operator_id
                         })\n`
                 }
+                isManage ? logger.info("[椰奶]群聊管理撤回") : logger.info("[椰奶]群聊撤回")
                 // 发送的消息
                 msg = [
                     segment.image(
diff --git a/apps/notice_message.js b/apps/notice_message.js
index 895e66f..620f162 100644
--- a/apps/notice_message.js
+++ b/apps/notice_message.js
@@ -50,6 +50,7 @@ export class anotice extends plugin {
             e.message_type === 'group' &&
             await redis.get(`yenai:notice:flashPhoto`)
         ) {
+            logger.info("[椰奶]群聊闪照")
             msg = [
                 segment.image(`https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`),
                 '[消息 - 闪照消息]\n',
@@ -64,6 +65,7 @@ export class anotice extends plugin {
             e.message_type === 'discuss' &&
             await redis.get(`yenai:notice:flashPhoto`)
         ) {
+            logger.info("[椰奶]讨论组闪照")
             msg = [
                 segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`),
                 '[消息 - 闪照消息]\n',
@@ -78,6 +80,7 @@ export class anotice extends plugin {
             e.message_type === 'private' &&
             await redis.get(`yenai:notice:flashPhoto`)
         ) {
+            logger.info("[椰奶]好友闪照")
             msg = [
                 segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`),
                 '[消息 - 闪照消息]\n',
@@ -95,7 +98,7 @@ export class anotice extends plugin {
                 forwardMsg = arr.msg
                 res = arr.type
             }
-
+            logger.info("[椰奶]好友消息")
             msg = [
                 segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`),
                 '[消息 - 好友消息]\n',
@@ -123,6 +126,7 @@ export class anotice extends plugin {
                 forwardMsg = arr.msg
                 res = arr.type
             }
+            logger.info("[椰奶]群临时消息")
             // 发送的消息
             msg = [
                 segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`),
@@ -141,7 +145,7 @@ export class anotice extends plugin {
                 forwardMsg = arr.msg
                 res = arr.type
             }
-
+            logger.info("[椰奶]群聊消息")
             msg = [
                 segment.image(`https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`),
                 '[消息 - 群聊消息]\n',
@@ -154,6 +158,7 @@ export class anotice extends plugin {
             ]
         } else if (e.message_type === 'discuss') {
             if (!await redis.get(`yenai:notice:groupMessage`)) return
+            logger.info("[椰奶]讨论组消息")
             msg = [
                 segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`),
                 '[消息 - 群聊消息]\n',
diff --git a/apps/request_friend.js b/apps/request_friend.js
index 5b09c65..6cd0e4b 100644
--- a/apps/request_friend.js
+++ b/apps/request_friend.js
@@ -15,6 +15,7 @@ export class application extends plugin {
 
     async accept(e) {
         if (!await redis.get(`yenai:notice:friendRequest`)) return
+        logger.info("[椰奶]好友申请")
         let msg = [
             segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`),
             '[通知 - 添加好友申请]\n',
diff --git a/apps/request_group.js b/apps/request_group.js
index 9fff65c..0c5f6aa 100644
--- a/apps/request_group.js
+++ b/apps/request_group.js
@@ -24,7 +24,7 @@ export class invitation extends plugin {
         if (!await redis.get(`yenai:notice:groupInviteRequest`)) return
 
         if (cfg.masterQQ.includes(e.user_id)) return
-
+        logger.info("[椰奶]邀请机器人进群")
         msg = [
             segment.image(`https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/0`),
             '[通知 - 邀请机器人进群]\n',
diff --git a/apps/set.js b/apps/set.js
index d4c5dff..f13c12f 100644
--- a/apps/set.js
+++ b/apps/set.js
@@ -91,15 +91,16 @@ export class NewConfig extends plugin {
 
         if (yes) {
             for (let i in configs) {
-                if (configs[i] == "deltime") continue
+                if (configs[i] == "deltime" || configs[i] == "notificationsAll") continue
                 await redis.set(`yenai:notice:${configs[i]}`, "1");
-                console.log(1);
+                logger.info(`[椰奶]已启用${i}`)
                 await common.sleep(200)
             }
         } else {
             for (let i in configs) {
-                if (configs[i] == "deltime") continue
+                if (configs[i] == "deltime" || configs[i] == "notificationsAll") continue
                 await redis.del(`yenai:notice:${configs[i]}`);
+                logger.info(`[椰奶]已禁用${i}`)
                 await common.sleep(200)
             }
         }