onebots 0.1.8 → 0.1.10

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

@@ -15,25 +15,27 @@ async function processMusic(target_type, target_id, element) {
 }
 exports.processMusic = processMusic;
 async function processMessage(message, quote_id) {
-    const forward = message.find(e => e.type === 'node');
+    const forward = message.find(e => e.type === 'forward');
     if (forward)
         (0, utils_1.remove)(message, forward);
     let quote = message.find(e => e.type === 'reply');
     if (quote)
         (0, utils_1.remove)(message, quote);
+    // 直接发node？不允许，你用forward作为载体吧
+    message = message.filter(n => n.type !== 'node');
     const element = V12_1.V12.fromSegment(message);
     if (forward)
         element.unshift(
         // 构造抓发消息
         await this.makeForwardMsg(await Promise.all(
         // 处理转发消息段
-        forward.data.message.map(async (segment) => {
+        forward.data.nodes.filter(n => n.type === 'node').map(async (forwardNode) => {
             return {
                 // 转发套转发处理
-                message: (await processMessage.apply(this, [V12_1.V12.fromSegment([segment])])).element,
-                user_id: forward.data.user_id,
-                nickname: forward.data.user_name,
-                time: forward.data.time
+                message: (await processMessage.apply(this, [V12_1.V12.fromSegment(forwardNode.data.message)])).element,
+                user_id: Number(forwardNode.data.user_id),
+                nickname: forwardNode.data.user_name,
+                time: forwardNode.data.time
             };
         }))));
     if (quote && !quote_id)

package/lib/service/V12/index.d.ts

@@ -60,7 +60,7 @@ export declare namespace V12 {
     interface SegmentMap {
         face: {
             id: number;
-            text: string;
+            text?: string;
         };
         text: {
             text: string;
@@ -81,6 +81,9 @@ export declare namespace V12 {
         file: {
             file_id: string;
         };
+        forward: {
+            nodes: SegmentElem<'node'>[];
+        };
         music: {
             type: "163" | 'qq' | 'xm' | 'custom';
             id?: string;
@@ -91,11 +94,11 @@ export declare namespace V12 {
         location: {
             latitude: number;
             longitude: number;
-            title: string;
-            content: string;
+            title?: string;
+            content?: string;
         };
         node: {
-            user_id: number;
+            user_id: string;
             time?: number;
             user_name?: string;
             message: SegmentElem[];

package/package.json

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