From 39c36e75095119f7121ecb195bbc4eee048bc0b8 Mon Sep 17 00:00:00 2001 From: yeyang <746659424@qq.com> Date: Mon, 1 May 2023 00:27:14 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A9=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin.js | 2 +- apps/events/input.js | 2 +- apps/events/message.js | 10 +++++----- apps/events/notice_friend.js | 8 ++++---- apps/events/request.js | 4 ++-- apps/fun.js | 2 +- apps/state.js | 2 +- components/Config.js | 2 +- guoba.support.js | 2 +- lib/common/common.js | 4 ++-- lib/puppeteer/render.js | 2 +- model/State.js | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/apps/admin.js b/apps/admin.js index 2680176..f0fe719 100644 --- a/apps/admin.js +++ b/apps/admin.js @@ -162,7 +162,7 @@ export class Admin extends plugin { let _cfg = Config.getGroup(e.group_id) for (let key in _cfg) { if (special.includes(key)) { - data[key] = Number(Config.Notice[key]) + data[key] = Number(Config.whole[key]) } else { let groupCfg = Config.getConfig('group')[e.group_id] let isAlone = groupCfg ? groupCfg[key] : undefined diff --git a/apps/events/input.js b/apps/events/input.js index 0f71f13..65601d1 100644 --- a/apps/events/input.js +++ b/apps/events/input.js @@ -2,7 +2,7 @@ import { common } from '../../model/index.js' import { Config } from '../../components/index.js' Bot.on('internal.input', async (e) => { - if (!Config.Notice.input) return false + if (!Config.whole.input) return false // 判断是否主人消息 if (Config.masterQQ.includes(e.user_id)) return false let msg = [ diff --git a/apps/events/message.js b/apps/events/message.js index 3c37ae2..40493b8 100644 --- a/apps/events/message.js +++ b/apps/events/message.js @@ -7,7 +7,7 @@ Bot.on('message', async (e) => { // 判断是否主人消息 if (Config.masterQQ.includes(e.user_id)) return false // 删除缓存时间 - const deltime = Config.Notice.deltime + const deltime = Config.whole.deltime // 判断群聊还是私聊 if (e.isGroup) { // 关闭撤回停止存储 @@ -22,7 +22,7 @@ Bot.on('message', async (e) => { } } else if (e.isPrivate) { // 关闭撤回停止存储 - if (Config.Notice.PrivateRecall) { + if (Config.whole.PrivateRecall) { logger.debug(`[Yenai-Plugin]存储私聊消息(${e.user_id})=> ${e.message_id}`) // 写入 await redis.set( @@ -53,7 +53,7 @@ Bot.on('message', async (e) => { } else if ( e.message[0].type == 'flash' && e.message_type === 'discuss' && - Config.Notice.flashPhoto + Config.whole.flashPhoto ) { logger.mark('[Yenai-Plugin]讨论组闪照') msg = [ @@ -68,7 +68,7 @@ Bot.on('message', async (e) => { } else if ( e.message[0].type == 'flash' && e.message_type === 'private' && - Config.Notice.flashPhoto + Config.whole.flashPhoto ) { logger.mark('[Yenai-Plugin]好友闪照') msg = [ @@ -79,7 +79,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 false + if (!Config.whole.privateMessage) return false // 特殊消息处理 const arr = getMsgType(e.message) diff --git a/apps/events/notice_friend.js b/apps/events/notice_friend.js index b4d4a3e..9a25bb4 100644 --- a/apps/events/notice_friend.js +++ b/apps/events/notice_friend.js @@ -6,7 +6,7 @@ Bot.on('notice.friend', async (e) => { let forwardMsg switch (e.sub_type) { case 'increase': { - if (!Config.Notice.friendNumberChange) return false + if (!Config.whole.friendNumberChange) return false logger.mark('[Yenai-Plugin]新增好友') msg = [ segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`), @@ -17,7 +17,7 @@ Bot.on('notice.friend', async (e) => { break } case 'decrease': { - if (!Config.Notice.friendNumberChange) return false + if (!Config.whole.friendNumberChange) return false logger.mark('[Yenai-Plugin]好友减少') msg = [ segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`), @@ -28,7 +28,7 @@ Bot.on('notice.friend', async (e) => { break } case 'recall': { - if (!Config.Notice.PrivateRecall) return false + if (!Config.whole.PrivateRecall) return false if (e.user_id == (e.bot ?? Bot).uin) return false // 主人撤回 @@ -74,7 +74,7 @@ Bot.on('notice.friend', async (e) => { break } case 'poke': { - if (!Config.Notice.privateMessage) return false + if (!Config.whole.privateMessage) return false logger.mark('[Yenai-Plugin]好友戳一戳') msg = [ segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`), diff --git a/apps/events/request.js b/apps/events/request.js index f98de1c..1f20f4b 100644 --- a/apps/events/request.js +++ b/apps/events/request.js @@ -13,7 +13,7 @@ Bot.on('request', async (e) => { case 'group': switch (e.sub_type) { case 'invite': - if (!Config.Notice.groupInviteRequest) return false + if (!Config.whole.groupInviteRequest) return false if (cfg.masterQQ.includes(e.user_id)) return false logger.mark('[Yenai-Plugin]邀请机器人进群') msg = [ @@ -60,7 +60,7 @@ Bot.on('request', async (e) => { } break case 'friend': - if (!Config.Notice.friendRequest) return false + if (!Config.whole.friendRequest) return false logger.mark('[Yenai-Plugin]好友申请') msg = [ segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${e.user_id}`), diff --git a/apps/fun.js b/apps/fun.js index 464ea45..22519f8 100644 --- a/apps/fun.js +++ b/apps/fun.js @@ -131,7 +131,7 @@ export class Fun extends plugin { } /** 判断是否为好友 */ let isFriend = await (e.bot ?? Bot).fl.get(e.user_id) - let allowLikeByStrangers = Config.Notice.Strangers_love + let allowLikeByStrangers = Config.whole.Strangers_love if (!isFriend && !allowLikeByStrangers) return e.reply('不加好友不点🙄', true) /** 执行点赞 */ diff --git a/apps/state.js b/apps/state.js index 25353ee..0e3303e 100644 --- a/apps/state.js +++ b/apps/state.js @@ -33,7 +33,7 @@ export class NewState extends plugin { }) } - if (!/椰奶/.test(e.msg) && !Config.Notice.state) return false + if (!/椰奶/.test(e.msg) && !Config.whole.state) return false if (!State.si) return e.reply('❎ 没有检测到systeminformation依赖，请运行："pnpm add systeminformation -w"进行安装') diff --git a/components/Config.js b/components/Config.js index 4ed2e28..1927c93 100644 --- a/components/Config.js +++ b/components/Config.js @@ -52,7 +52,7 @@ class Config { } /** 获取全局设置 */ - get Notice () { + get whole () { return this.getDefOrConfig('whole') } diff --git a/guoba.support.js b/guoba.support.js index 695d722..3b39f1e 100644 --- a/guoba.support.js +++ b/guoba.support.js @@ -376,7 +376,7 @@ export function supportGuoba () { // 获取配置数据方法（用于前端填充显示数据） getConfigData () { return { - whole: Config.Notice, + whole: Config.whole, pixiv: Config.pixiv, bika: Config.bika, picSearch: Config.picSearch diff --git a/lib/common/common.js b/lib/common/common.js index ef63c04..e7446c6 100644 --- a/lib/common/common.js +++ b/lib/common/common.js @@ -45,7 +45,7 @@ export default new class newCommon { /** 给主人发消息 */ async sendMasterMsg (msg) { - if (Config.Notice.notificationsAll) { + if (Config.whole.notificationsAll) { // 发送全部管理 for (let index of Config.masterQQ) { await common.relpyPrivate(index, msg) @@ -274,7 +274,7 @@ export default new class newCommon { */ async recallSendForwardMsg (e, msg, data = {}) { let recalltime = setu.getRecallTime(e.group_id) - let anony = Config.Notice.anonymous + let anony = Config.whole.anonymous return await this.getforwardMsg(e, msg, { recallMsg: recalltime, info: { diff --git a/lib/puppeteer/render.js b/lib/puppeteer/render.js index 267832c..2d2a50c 100644 --- a/lib/puppeteer/render.js +++ b/lib/puppeteer/render.js @@ -58,7 +58,7 @@ export default new class { } scale (pct = 1) { - let scale = Config.Notice.renderScale + let scale = Config.whole.renderScale scale = Math.min(2, Math.max(0.5, scale / 100)) pct = pct * scale return `style=transform:scale(${pct})` diff --git a/model/State.js b/model/State.js index 9339be3..29412a7 100644 --- a/model/State.js +++ b/model/State.js @@ -92,9 +92,9 @@ export default new class OSUtils { this.isGPU = true } // 给有问题的用户关闭定时器 - if (!Config.Notice.statusTask) return + if (!Config.whole.statusTask) return - if (Config.Notice.statusPowerShellStart) this.si.powerShellStart() + if (Config.whole.statusPowerShellStart) this.si.powerShellStart() // 网速 const Timer = setInterval(async () => {