From d339a778df6195b2f24255a9f74d0143d380625b Mon Sep 17 00:00:00 2001
From: linyuchen <lin.yu.chen@foxmail.com>
Date: Thu, 21 Mar 2024 19:54:59 +0800
Subject: [PATCH] fix: get_group_msg_history return type

---
 manifest.json                                       |  4 ++--
 src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts | 12 ++++++++----
 src/version.ts                                      |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/manifest.json b/manifest.json
index 96ae100..49d459c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,10 @@
 {
   "manifest_version": 4,
   "type": "extension",
-  "name": "LLOneBot v3.18.1",
+  "name": "LLOneBot v3.18.2",
   "slug": "LLOneBot",
   "description": "LiteLoaderQQNT的OneBotApi,不支持商店在线更新",
-  "version": "3.18.1",
+  "version": "3.18.2",
   "icon": "./icon.jpg",
   "authors": [
     {
diff --git a/src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts b/src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts
index 15e0557..3ac98ae 100644
--- a/src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts
+++ b/src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts
@@ -15,21 +15,25 @@ interface Payload {
     count: number
 }
 
-export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, OB11Message[]> {
+interface Response{
+    messages: OB11Message[]
+}
+
+export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Response> {
     actionName = ActionName.GoCQHTTP_GetGroupMsgHistory
 
-    protected async _handle(payload: Payload): Promise<OB11Message[]> {
+    protected async _handle(payload: Payload): Promise<Response> {
         const group = groups.find(group => group.groupCode === payload.group_id.toString())
         if (!group) {
             throw `群${payload.group_id}不存在`
         }
         const startMsgId = (await dbUtil.getMsgByShortId(payload.message_seq))?.msgId || "0"
         // log("startMsgId", startMsgId)
-        let msgList = (await NTQQMsgApi.getMsgHistory({chatType: ChatType.group, peerUid: group.groupCode}, startMsgId, parseInt(payload.count.toString()) || 0)).msgList
+        let msgList = (await NTQQMsgApi.getMsgHistory({chatType: ChatType.group, peerUid: group.groupCode}, startMsgId, parseInt(payload.count?.toString()) || 20)).msgList
         await Promise.all(msgList.map(async msg => {
             msg.msgShortId = await dbUtil.addMsg(msg)
         }))
         const ob11MsgList = await Promise.all(msgList.map(msg=>OB11Constructor.message(msg)))
-        return ob11MsgList
+        return {"messages": ob11MsgList}
     }
 }
\ No newline at end of file
diff --git a/src/version.ts b/src/version.ts
index 6a148ee..bd01704 100644
--- a/src/version.ts
+++ b/src/version.ts
@@ -1 +1 @@
-export const version = "3.18.1"
\ No newline at end of file
+export const version = "3.18.2"
\ No newline at end of file