fix: 移除非icqq平台的icqq依赖

lc-cn · Mar 9, 2024 · 8f0d0da · 8f0d0da
1 parent 9981c8c
commit 8f0d0da
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 44 deletions.
diff --git a/docs/src/guide/start.md b/docs/src/guide/start.md
@@ -12,7 +12,7 @@ npm init
 ## 2. 安装 `OneBots`
 - 在终端进入项目文件夹，并执行以下命令，安装 `OneBots`
 ```shell
-npm install onebots --legacy-peer-deps
+npm install onebots --legacy-peer-deps # 带上后边这个是为了防止自动安装对等依赖
 ```
 ## 3. 安装适配器
 - 根据你的需求，选择对应的适配器进行安装
@@ -40,16 +40,16 @@ E-Mail: # 你的公开邮箱地址
 
 ::: code-group
 ```shell [ICQQ]
-npm install @icqqjs/icqq
+npm install @icqqjs/icqq --legacy-peer-deps # 带上后边这个是为了防止自动安装对等依赖
 ```
 ```shell [QQ官方机器人]
-npm install qq-group-bot
+npm install qq-group-bot --legacy-peer-deps # 带上后边这个是为了防止自动安装对等依赖
 ```
 ```shell [钉钉机器人]
-npm install node-dd-bot
+npm install node-dd-bot --legacy-peer-deps # 带上后边这个是为了防止自动安装对等依赖
 ```
 ```shell [微信机器人]
-npm install lib-wechat
+npm install lib-wechat --legacy-peer-deps # 带上后边这个是为了防止自动安装对等依赖
 ```
 :::
 ## 4. 初始化配置

diff --git a/src/service/V11/action/common.ts b/src/service/V11/action/common.ts
@@ -1,7 +1,5 @@
 import { OneBotStatus } from "@/onebot";
 import { V11 } from "@/service/V11";
-import { Message } from "@icqqjs/icqq";
-import { MsgEntry } from "@/service/V11/db_entities";
 
 export class CommonAction {
     /**
@@ -34,8 +32,10 @@ export class CommonAction {
      */
     async getMsg(this: V11, message_id: number) {
         const msg_id = this.getStrByInt("message_id", message_id);
-        let msg: Message = await this.adapter.call(this.oneBot.uin, "V11", "getMessage", [msg_id]);
-        msg.message_id = message_id as any; // nonebot v11 要求 message_id 是 number 类型
+        let msg: V11.MessageRet = await this.adapter.call(this.oneBot.uin, "V11", "getMessage", [
+            msg_id,
+        ]);
+        msg.message_id = message_id; // nonebot v11 要求 message_id 是 number 类型
         msg["real_id"] = msg.message_id; // nonebot 的reply类型会检测real_id是否存在，虽然它从未使用
         return msg;
     }

diff --git a/src/service/V12/index.ts b/src/service/V12/index.ts
@@ -1,4 +1,3 @@
-import { EventMap } from "@icqqjs/icqq";
 import { version } from "@/utils";
 import { join } from "path";
 import { Config } from "./config";
@@ -12,7 +11,6 @@ import https from "https";
 import { WebSocket, WebSocketServer } from "ws";
 import { toBool, toHump, toLine, transformObj, uuid } from "@/utils";
 import { JsonDB } from "@/db";
-import { genDmMessageId, genGroupMessageId } from "@icqqjs/icqq/lib/message";
 import { Service } from "@/service";
 import { App } from "@/server/app";
 import { Dict } from "@zhinjs/shared";
@@ -406,27 +404,6 @@ export class V12 extends Service<"V12"> implements OneBot.Base {
                 data.message_type || data.notice_type || data.request_type || data.system_type;
         data.message =
             data.type === "message" ? this.adapter.toSegment("V12", data.message) : data.message;
-        if (data.source)
-            data.source = {
-                ...data.source,
-                message_id:
-                    data.detail_type === "private"
-                        ? genDmMessageId(
-                              data.source.user_id,
-                              data.source.seq,
-                              data.source.rand,
-                              data.source.time,
-                          )
-                        : genGroupMessageId(
-                              data.group_id,
-                              data.source.user_id,
-                              data.source.seq,
-                              data.source.rand,
-                              data.source.time,
-                          ),
-                user_id: data.source.user_id,
-                message: data.source.message,
-            };
         return V12.formatPayload(this.oneBot.uin, event, data as any);
     }
 
@@ -479,7 +456,7 @@ export class V12 extends Service<"V12"> implements OneBot.Base {
     }
     transformMedia(segment: V12.Segment): V12.Segment {
         const file = this.getFile(segment.data.file_id);
-        if (file)
+        if (file && file.data)
             return {
                 type: segment.type,
                 data: {
@@ -867,18 +844,7 @@ export namespace V12 {
             detail_type: "status_update";
             status: ReturnType<Action["getStatus"]>;
         };
-    } & TransformEventMap;
-    export type TransformEventMap = {
-        [P in keyof EventMap]: TransformEventParams<Parameters<EventMap[P]>>;
     };
-    export type TransformEventParams<T extends any[]> = T extends [infer L, ...infer R]
-        ? L extends object
-            ? L & {
-                  args: R;
-              }
-            : { args: [L, ...R] }
-        : { args: T };
-
     export function success<T extends any>(
         data: T,
         retcode: Result<T>["retcode"] = 0,