onebots 0.4.89 → 0.4.91

package/lib/adapters/icqq/index.js

@@ -188,8 +188,8 @@ class IcqqAdapter extends adapter_1.Adapter {
                 return {
                     type: "node",
                     data: {
-                        user_id: message.uin,
-                        nickname: message.name,
+                        user_id: message.uin || message.user_id,
+                        nickname: message.name || message.nickname,
                         message: message.content,
                     },
                 };
@@ -252,11 +252,9 @@ class IcqqAdapter extends adapter_1.Adapter {
             if (type === "node")
                 return {
                     type,
-                    data: {
-                        user_id: data.user_id,
-                        nickname: data.nickname,
-                        message: this.fromSegment(onebot, version, data.message),
-                    },
+                    user_id: data.user_id,
+                    nickname: data.nickname,
+                    message: this.fromSegment(onebot, version, data.message),
                 };
             return { type, ...data };
         });

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

@@ -129,10 +129,18 @@ export declare namespace V11 {
         message: Sendable;
     }
     type MessageNode = {
+        content: Sendable;
+    } & ({
         uin: number;
+        user_id: never;
         name: string;
-        content: Sendable;
-    };
+        nickname: never;
+    } | {
+        user_id: number;
+        uin: never;
+        nickname: string;
+        name: never;
+    });
     interface MessageRet {
         message_id: number;
     }

package/lib/service/V11/index.js

@@ -646,7 +646,7 @@ exports.V11 = V11;
             status: pending ? "async" : "ok",
             data,
             error: null,
-            echo
+            echo,
         };
     }
     V11.ok = ok;
@@ -658,7 +658,7 @@ exports.V11 = V11;
             error,
             msg: error,
             wording,
-            echo
+            echo,
         };
     }
     V11.error = error;

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

@@ -192,10 +192,18 @@ export declare namespace V12 {
         message: Sendable;
     }
     type MessageNode = {
+        content: Sendable;
+    } & ({
         uin: number;
+        user_id: never;
         name: string;
-        content: Sendable;
-    };
+        nickname: never;
+    } | {
+        user_id: number;
+        uin: never;
+        nickname: string;
+        name: never;
+    });
     interface Message {
     }
     interface MessageRet {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.4.89",
+  "version": "0.4.91",
   "description": "基于icqq的多例oneBot实现",
   "main": "lib/index.js",
   "bin": {