Merge pull request #489 from LLOneBot/dev

release: 4.1.1

README.md

@@ -23,6 +23,10 @@ TG 群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 [![Stargazers over time](https://starchart.cc/LLOneBot/LLOneBot.svg?variant=adaptive)](https://starchart.cc/LLOneBot/LLOneBot)
 
+## 贡献者
+
+[![Contributors](https://contributors-img.web.app/image?repo=LLOneBot/LLOneBot)](https://github.com/LOneBot/LLOneBot/graphs/contributors)
+
 ## 鸣谢
 
 - [NapCatQQ](https://github.com/NapNeko/NapCatQQ)

manifest.json

@@ -4,16 +4,12 @@
   "name": "LLOneBot",
   "slug": "LLOneBot",
   "description": "实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发",
-  "version": "4.1.3",
+  "version": "4.1.1",
   "icon": "./icon.webp",
   "authors": [
     {
       "name": "linyuchen",
       "link": "https://github.com/linyuchen"
-    },
-    {
-      "name": "idranme",
-      "link": "https://github.com/idranme"
     }
   ],
   "repository": {
@@ -34,4 +30,4 @@
     "main": "./main/main.cjs",
     "preload": "./preload/preload.cjs"
   }
-}
+}

package.json

@@ -28,7 +28,7 @@
     "fluent-ffmpeg": "^2.1.3",
     "minato": "^3.6.0",
     "protobufjs": "^7.4.0",
-    "silk-wasm": "^3.6.3",
+    "silk-wasm": "^3.6.1",
     "ts-case-convert": "^2.1.0",
     "ws": "^8.18.0"
   },
@@ -42,7 +42,7 @@
     "electron-vite": "^2.3.0",
     "protobufjs-cli": "^1.1.3",
     "typescript": "^5.6.3",
-    "vite": "^5.4.10 ",
+    "vite": "^5.4.9",
     "vite-plugin-cp": "^4.0.8"
   },
   "packageManager": "yarn@4.5.1"

src/common/utils/file.ts

@@ -122,11 +122,8 @@ export async function uri2local(ctx: Context, uri: string, needExt?: boolean): P
   const { type } = checkUriType(uri)
 
   if (type === FileUriType.FileURL) {
-    const fileUri = uri.replace('%', '%25').replace('#', '%23')
+    const filePath = fileURLToPath(uri)
-    const filePath = fileURLToPath(fileUri)
     const fileName = path.basename(filePath)
-    // console.log('fileURLToPath', filePath)
-    // console.log('fileName', fileName)
     return { success: true, errMsg: '', fileName, path: filePath, isLocal: true }
   }
 

src/main/main.ts

@@ -185,7 +185,7 @@ function onLoad() {
 
       if (config.enableLLOB && (config.satori.enable || config.ob11.enable)) {
         startHook()
-        await ctx.sleep(600)
+        await ctx.sleep(550)
       } else {
         llonebotError.otherError = 'LLOneBot 未启动'
         log('LLOneBot 开关设置为关闭，不启动 LLOneBot')
@@ -225,7 +225,7 @@ function onLoad() {
       started = true
       llonebotError.otherError = ''
     }
-  }, 500)
+  }, 600)
 }
 
 // 创建窗口时触发

src/ntqqapi/api/file.ts

@@ -43,7 +43,7 @@ export class NTQQFileApi extends Service {
       msgId,
       elemId: elementId,
       videoCodecFormat: 0,
-      exParams: {
+      params: {
         downSourceType: 1,
         triggerType: 1
       }

src/ntqqapi/hook.ts

@@ -70,12 +70,10 @@ export function startHook() {
                 delete hookApiCallbacks[callbackId]
               }
             } else if (args[2]) {
-              if (['IPC_DOWN_2', 'IPC_DOWN_3'].includes(args[0])) {
+              for (const receiveData of args[2]) {
-                for (const receiveData of args[2]) {
+                for (const hook of receiveHooks.values()) {
-                  for (const hook of receiveHooks.values()) {
+                  if (hook.method.includes(receiveData.cmdName)) {
-                    if (hook.method.includes(receiveData.cmdName)) {
+                    Promise.resolve(hook.hookFunc(receiveData.payload))
-                      Promise.resolve(hook.hookFunc(receiveData.payload))
-                    }
                   }
                 }
               }

src/onebot11/action/go-cqhttp/DownloadFile.ts

@@ -23,8 +23,8 @@ interface FileResponse {
 export class DownloadFile extends BaseAction<Payload, FileResponse> {
   actionName = ActionName.GoCQHTTP_DownloadFile
   payloadSchema = Schema.object({
-    url: Schema.string(),
+    url: String,
-    base64: Schema.string(),
+    base64: String,
     headers: Schema.union([String, Schema.array(String)])
   })
 

src/onebot11/entities.ts

@@ -478,13 +478,6 @@ export namespace OB11Entities {
             )
           }
         }
-        else if (groupElement.type === TipGroupElementType.MemberIncrease) {
-          const { memberUid, adminUid } = groupElement
-          if (memberUid !== selfInfo.uid) return
-          ctx.logger.info('收到群成员增加消息', groupElement)
-          const adminUin = adminUid ? await ctx.ntUserApi.getUinByUid(adminUid) : selfInfo.uin
-          return new OB11GroupIncreaseEvent(+msg.peerUid, +selfInfo.uin, +adminUin)
-        }
       }
       else if (element.fileElement) {
         return new OB11GroupUploadNoticeEvent(+msg.peerUid, +msg.senderUin!, {

src/version.ts

@@ -1 +1 @@
-export const version = '4.1.3'
+export const version = '4.1.1'