onebots 0.4.27 → 0.4.28

package/lib/adapter.d.ts

@@ -22,7 +22,7 @@ export interface Adapter extends Adapter.Base {
 }
 export declare namespace Adapter {
     interface Base {
-        toSegment<V extends OneBot.Version>(version: V, message: OneBot.MessageElement<V>[]): OneBot.Segment<V>[];
+        toSegment<V extends OneBot.Version, M = any>(version: V, message: M): OneBot.Segment<V>[];
         fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V>): OneBot.MessageElement<V>[];
         toCqcode<V extends OneBot.Version>(version: V, message: OneBot.MessageElement<V>[]): string;
         fromCqcode<V extends OneBot.Version>(version: V, message: string): OneBot.MessageElement<V>[];

package/lib/adapters/icqq/index.d.ts

@@ -13,7 +13,7 @@ export default class IcqqAdapter extends Adapter<'icqq'> {
     sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[]]): Promise<OneBot.MessageRet<V>>;
     call<V extends OneBot.Version>(uin: string, version: V, method: string, args?: any[]): Promise<any>;
     fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V> | OneBot.Segment<V>[]): OneBot.MessageElement<V>[];
-    toSegment<V extends OneBot.Version>(version: V, message: OneBot.MessageElement<V>[]): OneBot.Segment<V>[];
+    toSegment<V extends OneBot.Version, M = any>(version: V, message: M): OneBot.Segment<V>[];
     fromCqcode<V extends OneBot.Version>(version: V, message: string): OneBot.MessageElement<V>[];
     toCqcode<V extends OneBot.Version>(version: V, messageArr: OneBot.MessageElement<V>[]): string;
     getSelfInfo<V extends OneBot.Version>(uin: string, version: V): OneBot.SelfInfo<V>;

package/lib/adapters/icqq/index.js

@@ -20,6 +20,21 @@ const icqq_1 = require("icqq");
 const process_1 = __importDefault(require("process"));
 const fs_1 = require("fs");
 const onebot_1 = require("../../onebot");
+const processMessages = (list) => {
+    return list.map(item => {
+        const { type, data } = item;
+        if (type === 'node')
+            return {
+                type,
+                ...data,
+                message: processMessages(data.message || [])
+            };
+        return {
+            type,
+            ...data
+        };
+    });
+};
 class IcqqAdapter extends adapter_1.Adapter {
     constructor(app, config) {
         super(app, 'icqq', config);
@@ -81,23 +96,11 @@ class IcqqAdapter extends adapter_1.Adapter {
     }
     sendPrivateMessage(uin, version, args) {
         const [user_id, message] = args;
-        const result = this.oneBots.get(uin)?.internal.sendPrivateMsg(user_id, message.map(m => {
-            return {
-                type: m.type,
-                ...(m.data || {})
-            };
-        }));
-        return result;
+        return this.oneBots.get(uin)?.internal.sendPrivateMsg(user_id, processMessages(message));
     }
     sendGroupMessage(uin, version, args) {
         const [group_id, message] = args;
-        const result = this.oneBots.get(uin)?.internal.sendGroupMsg(group_id, message.map(m => {
-            return {
-                type: m.type,
-                ...(m.data || {})
-            };
-        }));
-        return result;
+        return this.oneBots.get(uin)?.internal.sendGroupMsg(group_id, processMessages(message));
     }
     call(uin, version, method, args = []) {
         try {
@@ -120,14 +123,14 @@ class IcqqAdapter extends adapter_1.Adapter {
                 };
             return {
                 type: item.type,
-                data: item
+                data: item.data
             };
         });
     }
     toSegment(version, message) {
         return [].concat(message).map(item => {
-            if (!item || typeof item !== "object")
-                return {
+            if (typeof item !== 'object')
+                item = {
                     type: 'text',
                     data: {
                         text: item

package/lib/adapters/qq/index.d.ts

@@ -2,13 +2,14 @@ import { Adapter } from "../../adapter";
 import { App } from "../../server/app";
 import { OneBot } from "../../onebot";
 import { QQBot } from "../../adapters/qq/qqBot";
+import { Sendable } from "../../adapters/qq/elements";
 export default class QQAdapter extends Adapter<'qq'> {
     #private;
     constructor(app: App, config: QQAdapter.Config);
     startOneBot(oneBot: OneBot): Promise<() => void>;
     call(uin: string, version: string, method: string, args?: any[]): Promise<any>;
     fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V> | OneBot.Segment<V>[]): OneBot.MessageElement<V>[];
-    toSegment<V extends OneBot.Version>(version: V, message: OneBot.MessageElement<V>[]): OneBot.Segment<V>[];
+    toSegment<V extends OneBot.Version, M = Sendable>(version: V, message: M): OneBot.Segment<V>[];
     fromCqcode<V extends OneBot.Version>(version: V, message: string): OneBot.MessageElement<V>[];
     toCqcode<V extends OneBot.Version>(version: V, messageArr: OneBot.MessageElement<V>[]): string;
     formatEventPayload<V extends OneBot.Version>(version: V, event: string, data: any): OneBot.Payload<V>;

package/lib/service/V12/index.js

@@ -408,14 +408,14 @@ class V12 extends service_1.Service {
                             if (/[CQ:music,type=.+,id=.+]/.test(params[k])) {
                                 params[k] = params[k].replace(',type=', ',platform=');
                             }
-                            params[k] = this.adapter.fromCqcode('V11', params[k]);
+                            params[k] = this.adapter.fromCqcode('V12', params[k]);
                         }
                         else {
                             if (params[k][0].type == 'music' && params[k][0]?.data?.type) {
                                 params[k][0].data.platform = params[k][0].data.type;
                                 delete params[k][0].data.type;
                             }
-                            params[k] = this.adapter.fromSegment('V11', params[k]);
+                            params[k] = this.adapter.fromSegment('V12', params[k]);
                         }
                     }
                     args.push(params[k]);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "onebots",
-    "version": "0.4.27",
+    "version": "0.4.28",
     "description": "基于icqq的多例oneBot实现",
     "engines": {
         "node": ">=16"