diff --git a/apps/fun.js b/apps/fun.js index 1b299de..b9e9e72 100644 --- a/apps/fun.js +++ b/apps/fun.js @@ -119,6 +119,7 @@ export class example extends plugin { /**点赞 */ async zan(e) { + if (Bot.config.platform == 3) return e.reply("❎ 手表协议暂不支持点赞请更换协议后重试") /**判断是否为好友 */ let isFriend = await Bot.fl.get(e.user_id) let likeByStrangers = Config.Notice.Strangers_love diff --git a/apps/notice_friend.js b/apps/notice_friend.js index 36d13f1..6aef5b3 100644 --- a/apps/notice_friend.js +++ b/apps/notice_friend.js @@ -19,7 +19,7 @@ export class Friends extends plugin { let forwardMsg switch (e.sub_type) { case 'increase': { - if (!Config.Notice.friendNumberChange) return + if (!Config.Notice.friendNumberChange) return false; logger.mark("[椰奶]新增好友") msg = [ segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`), @@ -30,7 +30,7 @@ export class Friends extends plugin { break } case 'decrease': { - if (!Config.Notice.friendNumberChange) return + if (!Config.Notice.friendNumberChange) return false; logger.mark("[椰奶]好友减少") msg = [ segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`), @@ -41,18 +41,18 @@ export class Friends extends plugin { break } case 'recall': { - if (!Config.Notice.PrivateRecall) return + if (!Config.Notice.PrivateRecall) return false; - if (e.user_id == Bot.uin) return + if (e.user_id == Bot.uin) return false; - if (Cfg.masterQQ.includes(e.user_id)) return + if (Cfg.masterQQ.includes(e.user_id)) return false logger.mark("[椰奶]好友撤回") // 读取 let res = JSON.parse( await redis.get(`notice:messagePrivate:${e.message_id}`) ) // 无数据 return - if (!res) return + if (!res) return false // 撤回为闪照处理 if (res[0].type === 'flash') { let url = res[0].url @@ -82,7 +82,7 @@ export class Friends extends plugin { break } case 'poke': { - if (!Config.Notice.privateMessage) return + if (!Config.Notice.privateMessage) return false logger.mark("[椰奶]好友戳一戳") msg = [ segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`), @@ -92,7 +92,7 @@ export class Friends extends plugin { break } default: - return + return false; } await Cfg.getSend(msg) if (forwardMsg) { diff --git a/apps/notice_group.js b/apps/notice_group.js index 6567f84..7030572 100644 --- a/apps/notice_group.js +++ b/apps/notice_group.js @@ -21,7 +21,7 @@ export class newgroups extends plugin { switch (e.sub_type) { case 'increase': { if (e.user_id === Bot.uin) { - if (!Config.getGroup(e.group_id).groupNumberChange) return + if (!Config.getGroup(e.group_id).groupNumberChange) return false; logger.mark("[椰奶]新增群聊") @@ -33,7 +33,7 @@ export class newgroups extends plugin { `新增群号:${e.group_id}` ] } else { - if (!Config.getGroup(e.group_id).groupMemberNumberChange) return + if (!Config.getGroup(e.group_id).groupMemberNumberChange) return false; logger.mark("[椰奶]新增群员") @@ -51,7 +51,7 @@ export class newgroups extends plugin { } case 'decrease': { if (e.dismiss) { - if (!Config.getGroup(e.group_id).groupNumberChange) return + if (!Config.getGroup(e.group_id).groupNumberChange) return false; logger.mark("[椰奶]群聊被解散") @@ -64,7 +64,7 @@ export class newgroups extends plugin { `解散群号:${e.group_id}` ] } else if (e.user_id === Bot.uin && e.operator_id !== Bot.uin) { - if (!Config.getGroup(e.group_id).groupNumberChange) return + if (!Config.getGroup(e.group_id).groupNumberChange) return false; logger.mark("[椰奶]机器人被踢") @@ -77,7 +77,7 @@ export class newgroups extends plugin { `被踢群号:${e.group_id}` ] } else if (e.user_id === Bot.uin && e.operator_id === Bot.uin) { - if (!Config.getGroup(e.group_id).groupNumberChange) return + if (!Config.getGroup(e.group_id).groupNumberChange) return false; logger.mark("[椰奶]机器人退群") @@ -89,7 +89,7 @@ export class newgroups extends plugin { `退出群号:${e.group_id}` ] } else if (e.operator_id === e.user_id) { - if (!Config.getGroup(e.group_id).groupMemberNumberChange) return + if (!Config.getGroup(e.group_id).groupMemberNumberChange) return false; logger.mark("[椰奶]群员退群") @@ -108,7 +108,7 @@ export class newgroups extends plugin { `退出群号:${e.group_id}` ] } else if (e.operator_id !== e.user_id) { - if (!Config.getGroup(e.group_id).groupMemberNumberChange) return + if (!Config.getGroup(e.group_id).groupMemberNumberChange) return false; logger.mark("[椰奶]群员被踢") @@ -132,7 +132,7 @@ export class newgroups extends plugin { } // 群管理变动 case 'admin': { - if (!Config.getGroup(e.group_id).groupAdminChange) return + if (!Config.getGroup(e.group_id).groupAdminChange) return false; e.set ? logger.mark("[椰奶]机器人被设置管理") : logger.mark("[椰奶]机器人被取消管理") if (e.user_id === Bot.uin) { @@ -166,9 +166,9 @@ export class newgroups extends plugin { case 'ban': { let Forbiddentime = Cfg.getsecondformat(e.duration) - if (!Config.getGroup(e.group_id).botBeenBanned) return + if (!Config.getGroup(e.group_id).botBeenBanned) return false; - if (e.user_id != Bot.uin) return + if (e.user_id != Bot.uin) return false; if (e.duration == 0) { logger.mark("[椰奶]机器人被解除禁言") @@ -198,7 +198,7 @@ export class newgroups extends plugin { } // 群转让 case 'transfer': { - if (!Config.getGroup(e.group_id).groupNumberChange) return + if (!Config.getGroup(e.group_id).groupNumberChange) return false; logger.mark("[椰奶]群聊转让") @@ -216,17 +216,17 @@ export class newgroups extends plugin { // 群撤回 case 'recall': { // 开启或关闭 - if (!Config.getGroup(e.group_id).groupRecall) return + if (!Config.getGroup(e.group_id).groupRecall) return false; // 是否为机器人撤回 - if (e.user_id == Bot.uin) return + if (e.user_id == Bot.uin) return false; // 是否为主人撤回 - if (Cfg.masterQQ.includes(e.user_id)) return + if (Cfg.masterQQ.includes(e.user_id)) return false; // 读取 let res = JSON.parse( await redis.get(`notice:messageGroup:${e.message_id}`) ) // 无数据 return出去 - if (!res) return + if (!res) return false; // 不同消息处理 let special = '' if (res[0].type === 'flash') { @@ -285,7 +285,7 @@ export class newgroups extends plugin { break } default: - return + return false; } await Cfg.getSend(msg) if (forwardMsg) { diff --git a/apps/notice_message.js b/apps/notice_message.js index a7fd4b0..b8a1408 100644 --- a/apps/notice_message.js +++ b/apps/notice_message.js @@ -16,9 +16,9 @@ export class anotice extends plugin { Bot.on("message", async (e) => { // 判断是否为机器人消息 - if (e.user_id == Bot.uin) return + if (e.user_id == Bot.uin) return false; // 判断是否主人消息 - if (Cfg.masterQQ.includes(e.user_id)) return + if (Cfg.masterQQ.includes(e.user_id)) return false; //删除缓存时间 let deltime = Config.Notice.deltime // 判断群聊还是私聊 @@ -53,7 +53,7 @@ Bot.on("message", async (e) => { e.message[0].type == 'flash' && e.message_type === 'group' ) { - if (!Config.getGroup(e.group_id).flashPhoto) return + if (!Config.getGroup(e.group_id).flashPhoto) return false; logger.mark("[椰奶]群聊闪照") msg = [ segment.image(`https://p.qlogo.cn/gh/${e.group_id}/${e.group_id}/100`), @@ -93,7 +93,7 @@ Bot.on("message", async (e) => { `闪照链接:${e.message[0].url}` ] } else if (e.message_type === 'private' && e.sub_type === 'friend') { - if (!Config.Notice.privateMessage) return + if (!Config.Notice.privateMessage) return false; let res = e.message // 特殊消息处理 @@ -122,7 +122,7 @@ Bot.on("message", async (e) => { ) } } else if (e.message_type === 'private' && e.sub_type === 'group') { - if (!Config.getGroup(e.group_id).grouptemporaryMessage) return + if (!Config.getGroup(e.group_id).grouptemporaryMessage) return false; // 特殊消息处理 let res = e.message let arr = getSpecial(e.message) @@ -150,7 +150,7 @@ Bot.on("message", async (e) => { ) } } else if (e.message_type === 'group') { - if (!Config.getGroup(e.group_id).groupMessage) return + if (!Config.getGroup(e.group_id).groupMessage) return false; // 特殊消息处理 let res = e.message let arr = getSpecial(e.message) @@ -170,7 +170,7 @@ Bot.on("message", async (e) => { ...res ] } else if (e.message_type === 'discuss') { - if (!Config.getGroup(e.group_id).groupMessage) return + if (!Config.getGroup(e.group_id).groupMessage) return false; logger.mark("[椰奶]讨论组消息") msg = [ segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`), diff --git a/apps/notice_request.js b/apps/notice_request.js index 8deca09..cd44e9d 100644 --- a/apps/notice_request.js +++ b/apps/notice_request.js @@ -60,7 +60,7 @@ export class invitation extends plugin { } break; case 'friend': - if (!Config.Notice.friendRequest) return + if (!Config.Notice.friendRequest) return false; logger.mark("[椰奶]好友申请") msg = [ segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`),