onebots 0.4.1 → 0.4.3

package/lib/onebot.d.ts

@@ -2,7 +2,7 @@
 import 'icqq-cq-enable';
 import { EventEmitter } from 'events';
 import { App } from "./server/app";
-import { Client } from "icqq";
+import { Client, Platform } from "icqq";
 import { V11 } from "./service/V11";
 import { V12 } from "./service/V12";
 import { MayBeArray } from "./types";
@@ -32,6 +32,7 @@ export declare namespace OneBot {
     type Version = 'V11' | 'V12';
     type Config<V extends Version = 'V11'> = ({
         version?: V;
+        platform?: Platform;
         password?: string;
     } & (V extends 'V11' ? V11.Config : V12.Config));
     interface Base {

package/lib/onebot.js

@@ -47,7 +47,10 @@ class OneBot extends events_1.EventEmitter {
         this.app = app;
         this.uin = uin;
         config = [].concat(config);
+        let platform = this.app.config.platform;
         this.config = config.map(c => {
+            if (c.platform)
+                platform = c.platform;
             if (c.password)
                 this.password = c.password;
             if (!c.version)
@@ -61,7 +64,7 @@ class OneBot extends events_1.EventEmitter {
                     throw new Error('不支持的oneBot版本：' + c.version);
             }
         });
-        this.client = new icqq_1.Client({ platform: this.app.config.platform, data_dir: (0, path_1.join)(app_1.App.configDir, 'data') });
+        this.client = new icqq_1.Client({ platform, data_dir: (0, path_1.join)(app_1.App.configDir, 'data') });
         this.instances = this.config.map(c => {
             switch (c.version) {
                 case 'V11':
@@ -174,13 +177,13 @@ class OneBot extends events_1.EventEmitter {
             if (data.source) {
                 switch (data.message_type) {
                     case 'group':
-                        data.message.shift({
+                        data.message.unshift({
                             type: 'reply',
                             message_id: (0, message_1.genGroupMessageId)(data.group_id, data.source.user_id, data.source.seq, data.source.rand, data.source.time)
                         });
                         break;
                     case 'private':
-                        data.message.shift({
+                        data.message.unshift({
                             type: 'reply',
                             message_id: (0, message_1.genDmMessageId)(data.source.user_id, data.source.seq, data.source.rand, data.source.time)
                         });

package/lib/server/router.d.ts

@@ -5,5 +5,5 @@ import { WebSocketServer } from "ws";
 import http from "http";
 export declare class Router extends KoaRouter {
     wsStack: WebSocketServer[];
-    ws(path: string, server: http.Server): import("ws").Server<import("ws").WebSocket>;
+    ws(path: string, server: http.Server): import("ws").Server<typeof import("ws"), typeof http.IncomingMessage>;
 }

package/lib/service/V12/action/common.d.ts

@@ -7,6 +7,68 @@ export declare class CommonAction {
      * @param message_id {string} 消息id
      */
     deleteMsg(this: V12, message_id: string): Promise<boolean>;
+    /**
+     * 获取消息详情
+     */ F: any;
+    getMsg(this: V12, message_id: string): Promise<{
+        message: V12.SegmentElem<keyof V12.SegmentMap>[];
+        message_type: "group";
+        sub_type: "normal" | "anonymous";
+        group_id: number;
+        group_name: string;
+        anonymous: import("icqq").Anonymous;
+        block: boolean;
+        atme: boolean;
+        atall: boolean;
+        sender: {
+            user_id: number;
+            nickname: string;
+            card: string;
+            sex: import("icqq").Gender;
+            age: number;
+            area: string;
+            level: number;
+            role: import("icqq").GroupRole;
+            title: string;
+        };
+        user_id: number;
+        post_type: "message";
+        time: number;
+        raw_message: string;
+        font: string;
+        message_id: string;
+        seq: number;
+        rand: number;
+        source?: import("icqq").Quotable;
+        pktnum: number;
+        index: number;
+        div: number;
+    } | {
+        message: V12.SegmentElem<keyof V12.SegmentMap>[];
+        message_type: "private";
+        sub_type: "self" | "other" | "group" | "friend";
+        from_id: number;
+        to_id: number;
+        auto_reply: boolean;
+        sender: {
+            user_id: number;
+            nickname: string;
+            group_id: number;
+            discuss_id: number;
+        };
+        user_id: number;
+        post_type: "message";
+        time: number;
+        raw_message: string;
+        font: string;
+        message_id: string;
+        seq: number;
+        rand: number;
+        source?: import("icqq").Quotable;
+        pktnum: number;
+        index: number;
+        div: number;
+    }>;
     getSelfInfo(this: V12): {
         user_id: string;
         platform: string;

package/lib/service/V12/action/common.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonAction = void 0;
+const V12_1 = require("../../../service/V12");
 const icqq_1 = require("icqq");
 const utils_1 = require("../../../utils");
 const onebot_1 = require("../../../onebot");
@@ -16,6 +17,15 @@ class CommonAction {
     deleteMsg(message_id) {
         return this.client.deleteMsg(message_id);
     }
+    async getMsg(message_id) {
+        const message = await this.client.getMsg(message_id);
+        if (!message)
+            throw new Error('消息不存在');
+        return {
+            ...message,
+            message: V12_1.V12.toSegment(message.message)
+        };
+    }
     getSelfInfo() {
         return {
             user_id: this.oneBot.uin + '',

package/lib/service/V12/index.js

@@ -340,14 +340,13 @@ class V12 extends events_1.EventEmitter {
             data.detail_type = data.message_type || data.notice_type || data.request_type || data.system_type;
         data.message = data.type === 'message' ? V12.toSegment(data.message) : data.message;
         if (data.source)
-            data.quote = {
-                type: 'reply',
-                data: {
-                    message_id: data.detail_type === 'private' ?
-                        (0, message_1.genDmMessageId)(data.source.user_id, data.source.seq, data.source.rand, data.source.time) :
-                        (0, message_1.genGroupMessageId)(data.group_id, data.source.user_id, data.source.seq, data.source.rand, data.source.time),
-                    user_id: data.source.user_id
-                }
+            data.source = {
+                ...data.source,
+                message_id: data.detail_type === 'private' ?
+                    (0, message_1.genDmMessageId)(data.source.user_id, data.source.seq, data.source.rand, data.source.time) :
+                    (0, message_1.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);
     }
@@ -578,7 +577,7 @@ class V12 extends events_1.EventEmitter {
                 else {
                     code = 10003;
                     this.logger.debug(e);
-                    message = "请求格式错误";
+                    message = e?.message || "请求格式错误";
                 }
                 ws.send(JSON.stringify({
                     retcode: code,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"
@@ -55,7 +55,7 @@
   "dependencies": {
     "@koa/router": "^10.1.1",
     "@zhinjs/shared": "^0.0.9",
-    "icqq": "^0.3.6",
+    "icqq": "^0.3.15",
     "icqq-cq-enable": "^1.0.0",
     "js-yaml": "^4.1.0",
     "koa": "^2.13.4",