补充抽卡统计的命令匹配关键词

apps/character/ImgUpload.js

@@ -5,7 +5,7 @@ import { segment } from 'oicq'
 import MD5 from 'md5'
 import fetch from 'node-fetch'
 import lodash from 'lodash'
-import { Data } from '../../components/index.js'
+import { Cfg, Data } from '../../components/index.js'
 import { Character } from '../../models/index.js'
 
 const resPath = process.cwd() + '/plugins/miao-plugin/resources/'
@@ -200,6 +200,9 @@ export async function profileImgList (e) {
   if (!char || !char.name) {
     return false
   }
+  if ([1, 0].includes(Cfg.get('originalPic') * 1)) {
+    e.reply('已禁止获取面板图列表')
+  }
   let nickname = Bot.nickname
   if (e.isGroup) {
     let info = await Bot.getGroupMemberInfo(e.group_id, Bot.uin)

apps/gacha.js

@@ -9,15 +9,15 @@ app.reg({
   detail: {
     name: '抽卡记录',
     fn: Gacha.detail,
-    rule: /^#*喵喵(抽卡|抽奖|角色|武器|常驻|up)池*(记录|祈愿|分析)$/,
-    yzRule: /^#*(抽卡|抽奖|角色|武器|常驻|up)池*(记录|祈愿|分析)$/,
+    rule: /^#*喵喵(抽卡|抽奖|角色|武器|常驻|up)+池?(记录|祈愿|分析)$/,
+    yzRule: /^#*(抽卡|抽奖|角色|武器|常驻|up)+池?(记录|祈愿|分析)$/,
     yzCheck: () => Cfg.get('gachaStat', false)
   },
   stat: {
     name: '抽卡统计',
     fn: Gacha.stat,
-    rule: /^#*喵喵(全部|抽卡|抽奖|角色|武器|常驻|up|版本)池*统计$/,
-    yzRule: /^#*(抽奖|角色|武器|常驻|up|版本)池*统计$/,
+    rule: /^#*喵喵(全部|抽卡|抽奖|角色|武器|常驻|up|版本)+池?统计$/,
+    yzRule: /^#*(全部|抽卡|抽奖|角色|武器|常驻|up|版本)+池?统计$/,
     yzCheck: () => Cfg.get('gachaStat', false)
 
   }

models/MysApi.js

@@ -107,7 +107,9 @@ export default class MysApi {
     }
     e._reqCount++
     let ret = await mys.getData(api, data)
-    ret = await mysInfo.checkCode(ret, api, this.mys)
+    if (mysInfo && mysInfo.checkCode) {
+      ret = await mysInfo.checkCode(ret, api, this.mys)
+    }
     e._reqCount--
     if (e._reqCount === 0) {
       e.reply = e._original_reply

models/ProfileReq.js

@@ -60,7 +60,7 @@ export default class ProfileReq extends Base {
   }
 
   log (msg) {
-    logger.mark(`${logger.cyan(`【面板】${this.uid}`)} ：${msg}`)
+    logger.mark(`【面板】${this.uid} ：${msg}`)
   }
 
   async requestProfile (player, serv) {