Merge branch 'master' of github.com:yoimiya-kokomi/Miao-Yunzai

config/default_config/bot.yaml

@@ -5,6 +5,8 @@ log_level: info
 ignore_self: true
 # 被风控时是否尝试用分片发送
 resend: false
+# 发送消息错误时是否通知主人
+sendmsg_error: false
 # ffmpeg
 ffmpeg_path:
 ffprobe_path:

docker/Dockerfile

@@ -49,7 +49,7 @@ RUN export BUNDLE_FFMPEG=${BUNDLE_FFMPEG:-true} \
     \
     && _NPM_MIRROR_FLAG="" \
     && if [ "$USE_NPM_MIRROR"x = "true"x ]; then _NPM_MIRROR_FLAG="--registry=https://registry.npmmirror.com"; fi \
-    && npm install pnpm@7.30.0 -g $_NPM_MIRROR_FLAG \
+    && npm install pnpm -g $_NPM_MIRROR_FLAG \
     \
     && ((test "$BUNDLE_POETRY"x = "true"x \
     && apt-get update \

lib/common/common.js

@@ -80,9 +80,7 @@ async function makeForwardMsg (e, msg = [], dec = '', msgsscr = false) {
     try {
       let info = await e.bot.getGroupMemberInfo(e.group_id, id)
       name = info.card || info.nickname
-    } catch (err) {
-      logger.error(err)
-    }
+    } catch (err) { }
   }
 
   let userInfo = {
@@ -125,10 +123,8 @@ async function makeForwardMsg (e, msg = [], dec = '', msgsscr = false) {
           .replace(/___+/, `<title color="#777777" size="26">${dec}</title>`)
       }
     }
-  } catch (err) {
-    logger.error(err)
-  }
-
+  } catch (err) { }
+  
   return forwardMsg
 }
 

lib/events/login.js

@@ -31,6 +31,7 @@ export default class loginEvent extends EventListener {
       time++
       let res = await this.client.queryQrcodeResult()
       if (res.retcode === 0) {
+        inSlider = true
         console.log('\n')
         logger.info(logger.green('扫码成功，开始登录...'))
         console.log('\n')

lib/plugins/loader.js

@@ -177,7 +177,7 @@ class PluginsLoader {
    */
   async deal (e) {
     Object.defineProperty(e, 'bot', {
-      value: Bot
+      value: Bot[e?.self_id || Bot.uin]
     })
     /** 检查频道消息 */
     if (this.checkGuildMsg(e)) return
@@ -537,6 +537,7 @@ class PluginsLoader {
           }
           logger.error(`发送消息错误:${msg}`)
           logger.error(err)
+          if(cfg.bot.sendmsg_error) Bot[Bot.uin].pickUser(cfg.masterQQ[0]).sendMsg(`发送消息错误:${msg}`)
         }
 
         // 频道一下是不是频道

package.json

@@ -21,7 +21,7 @@
     "chalk": "^5.3.0",
     "chokidar": "^3.5.3",
     "https-proxy-agent": "7.0.2",
-    "icqq": "^0.6.2",
+    "icqq": "^0.6.3",
     "image-size": "^1.0.2",
     "inquirer": "^9.2.12",
     "lodash": "^4.17.21",

plugins/genshin/apps/user.js

@@ -38,11 +38,11 @@ export class user extends plugin {
           fnc: 'delCk'
         },
         {
-          reg: '^#?(原神|星铁)?(删除|解绑)uid\\s*[0-9]{1,2}$',
+          reg: '^#?(原神|星铁)?(删除|解绑)(uid|UID)\\s*[0-9]{1,2}$',
           fnc: 'delUid'
         },
         {
-          reg: '^#(原神|星铁)?绑定(uid|UID)?[1-9][0-9]{8}$',
+          reg: '^#(原神|星铁)?绑定(uid|UID)?\\s*[1-9][0-9]{8}$',
           fnc: 'bingUid'
         },
         {

plugins/genshin/defSet/gacha/pool.yaml

@@ -1,3 +1,21 @@
+- up4:
+    - 绮良良
+    - 久岐忍
+    - 香菱
+  up5:
+    - 赛诺
+  up5_2:
+    - 神里绫人
+  weapon5:
+    - 赤沙之杖
+    - 波乱月白经津
+  weapon4:
+    - 匣里龙吟
+    - 西风大剑
+    - 西风长枪
+    - 流浪乐章
+    - 西风猎弓
+  endTime: "2023-12-19 14:59:59"
 - up4:
     - 夏洛蒂
     - 柯莱

plugins/genshin/defSet/pool/301.yaml

@@ -1,3 +1,13 @@
+- from: '2023-11-28 18:00:00'
+  to: '2023-12-19 14:59:59'
+  five:
+    - 赛诺
+    - 神里绫人
+  four:
+    - 绮良良
+    - 久岐忍
+    - 香菱
+  name: 雳裁冥昭|苍流踏花
 - from: '2023-11-08 06:00:00'
   to: '2023-11-28 17:59:59'
   five:

plugins/genshin/defSet/pool/302.yaml

@@ -1,3 +1,15 @@
+- from: '2023-11-28 18:00:00'
+  to: '2023-12-19 14:59:59'
+  five:
+    - 赤沙之杖
+    - 波乱月白经津
+  four:
+    - 匣里龙吟
+    - 西风大剑
+    - 西风长枪
+    - 流浪乐章
+    - 西风猎弓
+  name: 神铸赋形
 - from: '2023-11-08 06:00:00'
   to: '2023-11-28 17:59:59'
   five:
@@ -9,6 +21,7 @@
     - 匣里灭辰
     - 祭礼残章
     - 绝弦
+  name: 神铸赋形
 - from: '2023-10-17 18:00:00'
   to: '2023-11-07 14:59:59'
   five:

plugins/genshin/defSet/role/index.yaml

@@ -8,7 +8,7 @@ avatar: 75
 level: 60
 
 # 总宝箱
-all_chest: 6038
+all_chest: 6044
 
 # 奇馈宝箱
 magic_chest: 221
@@ -20,7 +20,7 @@ luxurious_chest: 242
 precious_chest: 632
 
 # 精致宝箱
-exquisite_chest: 2076
+exquisite_chest: 2082
 
 # 普通宝箱
 common_chest: 2867

plugins/genshin/defSet/role/name.yaml

@@ -886,6 +886,7 @@
   - 海獭
   - 水獭
   - 龙王
+  - 那位来客
 10000088:
   - 夏洛蒂
   - Charlotte
@@ -898,6 +899,7 @@
   - 鸟记者
   - 狗仔队
   - 跑得快
+  - 战地记者
 10000089:
   - 芙宁娜
   - Furina
@@ -906,8 +908,11 @@
   - 水神
   - 芙宁娜女士
   - 大明星
+  - 演员
   - 芙芙
   - 傻芙芙
   - 罪人
   - 假水神
   - 水的女儿
+  - 白芙
+  - 黑芙

plugins/genshin/model/base.js

@@ -50,7 +50,7 @@ export default class base {
         game: 'sr',
       }
     }
-    let char = Character.get('芙宁娜', 'gs')
+    let char = Character.get('赛诺', 'gs')
     return {
       ...data,
       tplFile: `./plugins/genshin/resources/html/${this.model}/${this.model}.html`,

plugins/system/add.js

@@ -87,6 +87,10 @@ export class add extends plugin {
       this.e.reply('添加错误：没有关键词')
       return
     }
+    if (/uid/i.test(this.keyWord)) {
+      this.e.reply('请勿添加特殊关键词')
+      return
+    }
 
     this.setContext('addContext')