From 6be6151d73127dab214db56231253d288ae44bbf Mon Sep 17 00:00:00 2001
From: idranme <idranme@outlook.com>
Date: Wed, 28 Aug 2024 10:25:17 +0800
Subject: [PATCH] fix

---
 src/common/utils/file.ts              | 2 +-
 src/common/utils/misc.ts              | 1 +
 src/ntqqapi/constructor.ts            | 2 ++
 src/ntqqapi/types/msg.ts              | 2 ++
 src/onebot11/action/llonebot/Debug.ts | 4 ++--
 src/onebot11/connect/http.ts          | 2 +-
 src/onebot11/helper/createMessage.ts  | 6 +++---
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/common/utils/file.ts b/src/common/utils/file.ts
index 95ab6c9..914f9ea 100644
--- a/src/common/utils/file.ts
+++ b/src/common/utils/file.ts
@@ -143,7 +143,7 @@ export async function uri2local(uri: string, filename?: string): Promise<Uri2Loc
       await fsPromise.writeFile(filePath, res.data)
       return { success: true, errMsg: '', fileName: filename, path: filePath, isLocal: false }
     } catch (e: any) {
-      const errMsg = `${uri}下载失败,` + e.toString()
+      const errMsg = `${uri} 下载失败, ${e.message}`
       return { success: false, errMsg, fileName: '', path: '', isLocal: false }
     }
   }
diff --git a/src/common/utils/misc.ts b/src/common/utils/misc.ts
index 44218d1..80c8a50 100644
--- a/src/common/utils/misc.ts
+++ b/src/common/utils/misc.ts
@@ -9,6 +9,7 @@ export function calcQQLevel(level: QQLevel) {
   return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum
 }
 
+/** QQ Build Version  */
 export function getBuildVersion(): number {
   const version: string = globalThis.LiteLoader.versions.qqnt
   return +version.split('-')[1]
diff --git a/src/ntqqapi/constructor.ts b/src/ntqqapi/constructor.ts
index bdc3084..309319f 100644
--- a/src/ntqqapi/constructor.ts
+++ b/src/ntqqapi/constructor.ts
@@ -303,6 +303,8 @@ export namespace SendMsgElementConstructor {
     return {
       elementType: ElementType.MFACE,
       marketFaceElement: {
+        imageWidth: 300,
+        imageHeight: 300,
         emojiPackageId,
         emojiId,
         key,
diff --git a/src/ntqqapi/types/msg.ts b/src/ntqqapi/types/msg.ts
index ec70771..adb249c 100644
--- a/src/ntqqapi/types/msg.ts
+++ b/src/ntqqapi/types/msg.ts
@@ -335,6 +335,8 @@ export interface MarketFaceElement {
   faceName?: string
   emojiId: string
   key: string
+  imageWidth?: number
+  imageHeight?: number
 }
 
 export interface VideoElement {
diff --git a/src/onebot11/action/llonebot/Debug.ts b/src/onebot11/action/llonebot/Debug.ts
index f89f213..0cde238 100644
--- a/src/onebot11/action/llonebot/Debug.ts
+++ b/src/onebot11/action/llonebot/Debug.ts
@@ -14,9 +14,9 @@ export default class Debug extends BaseAction<Payload, any> {
     const { ntMsgApi, ntFileApi, ntFileCacheApi, ntFriendApi, ntGroupApi, ntUserApi, ntWindowApi } = this.ctx
     const ntqqApi = [ntMsgApi, ntFriendApi, ntGroupApi, ntUserApi, ntFileApi, ntFileCacheApi, ntWindowApi]
     for (const ntqqApiClass of ntqqApi) {
-      const method = ntqqApiClass[payload.method]
+      const method = ntqqApiClass[payload.method] as Function
       if (method) {
-        const result = method(...payload.args)
+        const result = method.apply(ntqqApiClass, payload.args)
         if (method.constructor.name === 'AsyncFunction') {
           return await result
         }
diff --git a/src/onebot11/connect/http.ts b/src/onebot11/connect/http.ts
index 408045a..086d553 100644
--- a/src/onebot11/connect/http.ts
+++ b/src/onebot11/connect/http.ts
@@ -113,7 +113,7 @@ class OB11Http {
       this.ctx.logger.error(err)
       throw err
     }
-    this.expressAPP[method](url, this.authorize, async (req: Request, res: Response) => {
+    this.expressAPP[method](url, this.authorize.bind(this), async (req: Request, res: Response) => {
       let payload = req.body
       if (method == 'get') {
         payload = req.query
diff --git a/src/onebot11/helper/createMessage.ts b/src/onebot11/helper/createMessage.ts
index 2c877eb..779d371 100644
--- a/src/onebot11/helper/createMessage.ts
+++ b/src/onebot11/helper/createMessage.ts
@@ -119,7 +119,7 @@ export async function createSendElements(
       case OB11MessageDataType.mface: {
         sendElements.push(
           SendMsgElementConstructor.mface(
-            sendMsg.data.emoji_package_id,
+            +sendMsg.data.emoji_package_id,
             sendMsg.data.emoji_id,
             sendMsg.data.key,
             sendMsg.data.summary,
@@ -203,8 +203,8 @@ async function handleOb11FileLikeMessage(
   } = (await uri2local(inputdata?.url || inputdata.file))
 
   if (!success) {
-    ctx.logger.error('文件下载失败', errMsg)
-    throw Error('文件下载失败' + errMsg)
+    ctx.logger.error(errMsg)
+    throw Error(errMsg)
   }
 
   if (!isLocal) { // 只删除http和base64转过来的文件