Upload 75 files

Yunzai/README.md

@@ -96,7 +96,7 @@ bash <(curl -L https://gitee.com/TimeRainStarSky/Yunzai/raw/main/lib/tools/docke
 | CMD | 启动命令 | tsyz |
 | CMDPATH | 命令文件夹 | /usr/local/bin |
 | DKNAME | 容器名 | Yunzai |
-| DKURL | Docker 源 | docker.nju.edu.cn |
+| DKURL | Docker 源 | docker.m.daocloud.io |
 | GITURL | GIT 源 | https://gitee.com/TimeRainStarSky/Yunzai |
 | APTURL | APT 源 | mirrors.ustc.edu.cn |
 | APTDEP | APT 依赖 | chromium fonts-lxgw-wenkai fonts-noto-color-emoji |

Yunzai/config/default_config/bot.yaml

@@ -9,6 +9,8 @@ log_object: true
 url: http://localhost:2536
 # 服务器端口
 port: 2536
+# 服务器缺省跳转地址
+redirect: https://github.com/TimeRainStarSky/Yunzai
 
 # 自动更新时间
 update_time: 1440

Yunzai/lib/bot.js

@@ -145,7 +145,7 @@ export default class Yunzai extends EventEmitter {
     await PluginsLoader.load()
     await ListenerLoader.load()
 
-    this.express.use(req => req.res.redirect("https://github.com/TimeRainStarSky/Yunzai"))
+    this.express.use(req => req.res.redirect(cfg.bot.redirect))
     this.makeLog("info", `连接地址：${logger.blue(`${cfg.bot.url.replace(/^http/, "ws")}/`)}${logger.cyan(`[${Object.keys(this.wsf)}]`)}`, "WebSocket")
     this.emit("online", this)
   }

Yunzai/lib/plugins/loader.js

@@ -256,7 +256,7 @@ class PluginsLoader {
             break a
           }
         } catch (err) {
-          Bot.makeLog("error", [`${e.logFnc}${e.logText}`, err], false)
+          Bot.makeLog("error", [`${e.logText}${e.logFnc}`, err], false)
           break a
         }
       }
@@ -344,7 +344,7 @@ class PluginsLoader {
             e.img = [i.url]
           break
         case "at":
-          if (i.qq === e.self_id)
+          if (i.qq == e.self_id)
             e.atBot = true
           else
             e.at = i.qq
@@ -404,24 +404,18 @@ class PluginsLoader {
 
     e.logText = `${logger.cyan(e.logText)}${logger.red(`[${lodash.truncate(e.msg || e.raw_message || Bot.String(e), { length: 100 })}]`)}`
 
-    if (e.user_id && cfg.master[e.self_id]?.includes(String(e.user_id))) {
+    if (e.user_id && cfg.master[e.self_id]?.includes(String(e.user_id)))
       e.isMaster = true
-    }
 
     /** 只关注主动at msg处理 */
     if (e.msg && e.isGroup) {
-      let groupCfg = cfg.getGroup(e.self_id, e.group_id)
-      let alias = groupCfg.botAlias
-      if (!Array.isArray(alias)) {
-        alias = [alias]
-      }
-      for (let name of alias) {
-        if (e.msg.startsWith(name)) {
-          e.msg = lodash.trimStart(e.msg, name).trim()
+      const alias = cfg.getGroup(e.self_id, e.group_id).botAlias
+      for (const i of Array.isArray(alias) ? alias : [alias])
+        if (e.msg.startsWith(i)) {
+          e.msg = lodash.trimStart(e.msg, i).trim()
           e.hasAlias = true
           break
         }
-      }
     }
   }
 

Yunzai/lib/plugins/plugin.js

@@ -70,11 +70,7 @@ export default class plugin {
   }
 
   conKey(isGroup = false) {
-    if (isGroup) {
-      return `${this.name}.${this.group_id || this.groupId || this.e.group_id}`
-    } else {
-      return `${this.name}.${this.user_id || this.userId || this.e.user_id}`
-    }
+    return `${this.name}.${this.self_id || this.e.self_id}.${isGroup ? (this.group_id || this.e.group_id) : (this.user_id || this.e.user_id)}`
   }
 
   /**

Yunzai/lib/tools/docker.sh

@@ -1,5 +1,5 @@
 #TRSS Yunzai Docker 安装脚本 作者：时雨🌌星空
-NAME=v1.0.0;VERSION=202405290
+NAME=v1.0.0 VERSION=202406200
 R="" G="" Y="" C="" B="" O=""
 echo "$B———————————————————————————
 $R TRSS$Y Yunzai$G Docker$C Script$O
@@ -13,7 +13,7 @@ DIR="${DIR:-$HOME/Yunzai}"
 CMD="${CMD:-tsyz}"
 CMDPATH="${CMDPATH:-/usr/local/bin}"
 DKNAME="${DKNAME:-Yunzai}"
-DKURL="${DKURL:-docker.nju.edu.cn}"
+DKURL="${DKURL:-docker.m.daocloud.io}"
 GITURL="${GITURL:-https://gitee.com/TimeRainStarSky/Yunzai}"
 APTURL="${APTURL:-mirrors.ustc.edu.cn}"
 APTDEP="${APTDEP:-chromium fonts-lxgw-wenkai fonts-noto-color-emoji}"
@@ -53,11 +53,12 @@ $R! 下载失败，5秒后切换镜像源$O"
   sleep 5
   ((N++))
   case "$N" in
-    1)DKURL="docker.nju.edu.cn";;
+    1)DKURL="docker.m.daocloud.io";;
     2)DKURL="mirror.ccs.tencentyun.com";;
-    3)DKURL="mirror.baidubce.com";;
-    4)DKURL="dockerproxy.com";;
-    5)DKURL="docker.m.daocloud.io";;
+    3)DKURL="dockerhub.timeweb.cloud";;
+    4)DKURL="mirror.baidubce.com";;
+    5)DKURL="docker.nju.edu.cn";;
+    6)DKURL="dockerproxy.com";;
     *)DKURL="docker.io";N=0
   esac
 done

Yunzai/package.json

@@ -20,7 +20,7 @@
     "chokidar": "^3.6.0",
     "express": "^4.19.2",
     "file-type": "^19.0.0",
-    "https-proxy-agent": "7.0.4",
+    "https-proxy-agent": "7.0.5",
     "image-size": "^1.1.1",
     "level": "^8.0.1",
     "lodash": "^4.17.21",
@@ -30,22 +30,22 @@
     "node-fetch": "link:lib/modules/node-fetch",
     "node-schedule": "^2.1.1",
     "oicq": "link:lib/modules/oicq",
-    "pm2": "^5.4.0",
+    "pm2": "^5.4.1",
     "puppeteer": "*",
     "redis": "^4.6.14",
     "sequelize": "^6.37.3",
     "sqlite3": "5.1.6",
     "strip-ansi": "^7.1.0",
     "ulid": "^2.3.0",
-    "ws": "^8.17.0",
-    "yaml": "^2.4.3"
+    "ws": "^8.17.1",
+    "yaml": "^2.4.5"
   },
   "devDependencies": {
     "eslint": "^8.57.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-promise": "^6.2.0"
+    "eslint-plugin-promise": "^6.4.0"
   },
   "imports": {
     "#miao": "./plugins/miao-plugin/components/index.js",

Yunzai/plugins/adapter/GSUIDCore.js

@@ -9,7 +9,7 @@ Bot.adapter.push(new class GSUIDCoreAdapter {
     return Bot.String(msg).replace(/base64:\/\/.*?"/g, "base64://...\"")
   }
 
-  makeButton(data, button) {
+  makeButton(button) {
     const msg = {
       text: button.text,
       pressed_text: button.clicked_text,
@@ -301,4 +301,4 @@ Bot.adapter.push(new class GSUIDCoreAdapter {
       ws.on("message", data => this.message(data, ws, ...args))
     )
   }
-})
+})

Yunzai/plugins/adapter/OneBotv11.js

@@ -250,7 +250,7 @@ Bot.adapter.push(new class OneBotv11Adapter {
           group_name: `${guild.guild_name}-${channel.channel_name}`,
         })
     } catch (err) {
-      Bot.makeLog("error", ["获取频道列表错误", err])
+      //Bot.makeLog("error", ["获取频道列表错误", err])
     }
     return array
   }