onebots 0.4.85 → 0.4.87

package/lib/adapters/icqq/index.js

@@ -136,7 +136,9 @@ class IcqqAdapter extends adapter_1.Adapter {
         if (version === "V11" && result.message_id) {
             result.message_id = oneBot.V11.transformToInt("message_id", result.message_id);
         }
-        return result;
+        return Object.fromEntries(Object.entries(result).filter(([_, value]) => {
+            return typeof value === "function";
+        }));
     }
     async sendPrivateMessage(uin, version, args) {
         const [user_id, message, source] = args;
@@ -235,8 +237,12 @@ class IcqqAdapter extends adapter_1.Adapter {
         return []
             .concat(segment)
             .map(segment => {
-            if (version === "V12" && ["image", "video", "audio"].includes(segment.type))
-                return onebot.V12.transformMedia(segment);
+            if (version === "V12" && ["image", "video", "audio"].includes(segment.type)) {
+                const result = onebot.V12.transformMedia(segment);
+                result.data["file"] =
+                    result.data["file"] || result.data["file_id"] || result.data["url"];
+                return result;
+            }
             return segment;
         })
             .map(item => {

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

@@ -1,4 +1,3 @@
-import { MessageElem } from "@icqqjs/icqq";
-import { OneBot } from "../../onebot";
+import { MessageElem, Sendable } from "@icqqjs/icqq";
 import IcqqAdapter from "../../adapters/icqq/index";
-export declare function processMessages(this: IcqqAdapter, uin: string, target_id: number, target_type: "group" | "private", list: OneBot.Segment<OneBot.Version>[]): Promise<MessageElem[]>;
+export declare function processMessages(this: IcqqAdapter, uin: string, target_id: number, target_type: "group" | "private", list: Sendable): Promise<MessageElem[]>;

package/lib/adapters/icqq/utils.js

@@ -4,43 +4,41 @@ exports.processMessages = processMessages;
 const shareMusicCustom_1 = require("./shareMusicCustom");
 async function processMessages(uin, target_id, target_type, list) {
     let result = [];
-    for (const item of list) {
-        const { type, data, ...other } = item;
+    console.log(list);
+    for (const item of [].concat(list).filter(Boolean)) {
+        const { type, ...data } = item;
         switch (type) {
             case "node": {
-                const node = data || { ...other };
                 result.push({
                     type,
-                    ...node,
-                    user_id: node.user_id,
-                    message: await processMessages.call(this, uin, node.user_id, "private", node.content || []),
+                    ...data,
+                    user_id: data.user_id,
+                    message: await processMessages.call(this, uin, data.user_id, "private", data.message || []),
                 });
                 break;
             }
             case "music": {
-                if (String(item.data.platform) === "custom") {
-                    item.data.platform = item.data["subtype"]; // gocq 的平台数据存储在 subtype 内，兼容 icqq 时要求前端必须发送 id 字段
+                if (String(item.platform) === "custom") {
+                    item.platform = item["subtype"]; // gocq 的平台数据存储在 subtype 内，兼容 icqq 时要求前端必须发送 id 字段
                 }
                 await shareMusicCustom_1.shareMusic.call(this[target_type === "private" ? "pickFriend" : "pickGroup"](target_id), {
                     type,
-                    ...(data || other),
+                    ...data,
                 });
                 break;
             }
             case "share": {
-                await this[target_type === "private" ? "pickFriend" : "pickGroup"](target_id).shareUrl({ ...(data || other) });
+                await this[target_type === "private" ? "pickFriend" : "pickGroup"](target_id).shareUrl(data);
                 break;
             }
             case "video":
             case "audio":
             case "image": {
-                item["file"] = item["file"] || item["file_id"] || item["url"];
-                if (item["file"]?.startsWith("base64://"))
-                    item["file"] = Buffer.from(item["file"].slice(9), "base64");
+                if (data["file"]?.startsWith("base64://"))
+                    data["file"] = Buffer.from(data["file"].slice(9), "base64");
                 result.push({
                     type: type,
                     ...data,
-                    ...other,
                 });
                 break;
             }
@@ -58,7 +56,6 @@ async function processMessages(uin, target_id, target_type, list) {
                 result.push({
                     type: type,
                     ...data,
-                    ...other,
                 });
             }
         }

package/package.json

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