Upload 75 files

Yunzai/lib/bot.js

@@ -430,7 +430,8 @@ export default class Yunzai extends EventEmitter {
       times = cfg.bot.file_to_url_times,
     } = opts
 
-    file = await this.fileType({ file, name }, { http: true })
+    file = (typeof file === "object" && !Buffer.isBuffer(file) && { ...file }) ||
+      await this.fileType({ file, name }, { http: true })
     if (!Buffer.isBuffer(file.buffer)) return file.buffer
     file.name = file.name ? encodeURIComponent(file.name) : ulid()
 
@@ -719,7 +720,7 @@ export default class Yunzai extends EventEmitter {
 
   async sendForwardMsg(send, msg) {
     const messages = []
-    for (const { message } of msg)
+    for (const { message } of Array.isArray(msg) ? msg : [msg])
       messages.push(await send(message))
     return messages
   }

Yunzai/lib/common/common.js

@@ -49,7 +49,7 @@ function makeForwardMsg(e, msg = [], dec) {
   const forwardMsg = []
   if (dec)
     forwardMsg.push({ message: dec })
-  for (const message of msg)
+  for (const message of Array.isArray(msg) ? msg : [msg])
     forwardMsg.push({ message })
 
   if (e?.group?.makeForwardMsg)

Yunzai/lib/plugins/loader.js

@@ -40,6 +40,8 @@ class PluginsLoader {
 
   /** 星铁命令前缀 */
   srReg = /^#?(\*|星铁|星轨|穹轨|星穹|崩铁|星穹铁道|崩坏星穹铁道|铁道)+/
+  /** 绝区零前缀 */
+  zzzReg = /^#?(%|％|绝区零|绝区)+/
 
   async getPlugins() {
     const files = await fs.readdir(this.dir, { withFileTypes: true })
@@ -222,6 +224,9 @@ class PluginsLoader {
     if (this.srReg.test(e.msg)) {
       e.game = "sr"
       e.msg = e.msg.replace(this.srReg, "#星铁")
+    } else if (this.zzzReg.test(e.msg)) {
+      e.game = "zzz"
+      e.msg = e.msg.replace(this.zzzReg, "#绝区零")
     }
 
     /** 优先执行 accept */

Yunzai/lib/plugins/stdin.js

@@ -28,24 +28,28 @@ Bot.adapter.push(new class stdinAdapter {
         if (Buffer.isBuffer(file.buffer)) {
           file.path = `${this.path}${file.name}`
           await fs.writeFile(file.path, file.buffer)
+          file.url = `${file.url}\n路径: ${logger.cyan(file.path)}\n网址: ${logger.green(await Bot.fileToUrl(file))}`
         }
       }
 
       switch (i.type) {
         case "text":
           if (i.text.match("\n"))
-            i.text = `发送文本：\n${i.text}`
+            i.text = `发送文本: \n${i.text}`
           Bot.makeLog("info", i.text, this.id)
           break
         case "image":
           await this.catimg(file.path)
-          Bot.makeLog("info", `发送图片：${file.url}\n文件已保存到：${logger.cyan(file.path)}`, this.id)
+          Bot.makeLog("info", `发送图片: ${file.url}`, this.id)
           break
         case "record":
-          Bot.makeLog("info", `发送音频：${file.url}\n文件已保存到：${logger.cyan(file.path)}`, this.id)
+          Bot.makeLog("info", `发送音频: ${file.url}`, this.id)
           break
         case "video":
-          Bot.makeLog("info", `发送视频：${file.url}\n文件已保存到：${logger.cyan(file.path)}`, this.id)
+          Bot.makeLog("info", `发送视频: ${file.url}`, this.id)
+          break
+        case "file":
+          Bot.makeLog("info", `发送文件: ${file.url}`, this.id)
           break
         case "reply":
           break
@@ -62,19 +66,11 @@ Bot.adapter.push(new class stdinAdapter {
   }
 
   recallMsg(message_id) {
-    Bot.makeLog("info", `撤回消息：${message_id}`, this.id)
+    Bot.makeLog("info", `撤回消息: ${message_id}`, this.id)
   }
 
   async sendFile(file, name = path.basename(file)) {
-    const buffer = await Bot.Buffer(file)
-    if (!Buffer.isBuffer(buffer)) {
-      Bot.makeLog("error", `发送文件错误：找不到文件 ${logger.red(file)}`, this.id)
-      return false
-    }
-
-    const files = `${this.path}${Date.now().toString(36)}-${name}`
-    Bot.makeLog("info", `发送文件：${file}\n文件已保存到：${logger.cyan(files)}`, this.id)
-    return fs.writeFile(files, buffer)
+    return this.sendMsg(segment.file(file, name))
   }
 
   pickFriend() {
@@ -98,7 +94,7 @@ Bot.adapter.push(new class stdinAdapter {
       message: [{ type: "text", text: msg }],
       raw_message: msg,
     }
-    Bot.makeLog("info", `系统消息：${data.raw_message}`, this.id)
+    Bot.makeLog("info", `系统消息: ${data.raw_message}`, this.id)
     Bot.em(`${data.post_type}.${data.message_type}`, data)
   }
 

Yunzai/package.json

@@ -19,7 +19,7 @@
     "chalk": "^5.3.0",
     "chokidar": "^3.6.0",
     "express": "^4.19.2",
-    "file-type": "^19.0.0",
+    "file-type": "^19.1.1",
     "https-proxy-agent": "7.0.5",
     "image-size": "^1.1.1",
     "level": "^8.0.1",
@@ -30,14 +30,14 @@
     "node-fetch": "link:lib/modules/node-fetch",
     "node-schedule": "^2.1.1",
     "oicq": "link:lib/modules/oicq",
-    "pm2": "^5.4.1",
+    "pm2": "^5.4.2",
     "puppeteer": "*",
-    "redis": "^4.6.14",
+    "redis": "^4.6.15",
     "sequelize": "^6.37.3",
     "sqlite3": "5.1.6",
     "strip-ansi": "^7.1.0",
     "ulid": "^2.3.0",
-    "ws": "^8.17.1",
+    "ws": "^8.18.0",
     "yaml": "^2.4.5"
   },
   "devDependencies": {

Yunzai/plugins/system/status.js

@@ -30,7 +30,7 @@ export class status extends plugin {
       `系统版本：${process.platform} ${process.arch} ${process.version}`+
       this.botTime() + await this.count()
 
-    return this.reply(msg)
+    return this.reply(Bot.makeForwardArray(msg))
   }
 
   botTime() {