💩 优化代码

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

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 = [

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)

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}`),

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}`),

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)
 
     /** 执行点赞 */

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"进行安装')
 

components/Config.js

@@ -52,7 +52,7 @@ class Config {
   }
 
   /** 获取全局设置 */
-  get Notice () {
+  get whole () {
     return this.getDefOrConfig('whole')
   }
 

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

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: {

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})`

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 () => {