onebots 0.0.20 → 0.0.22

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FriendAction = void 0;
 const index_1 = require("../index");
+const utils_1 = require("../../../utils");
 class FriendAction {
     getUserInfo(user_id) {
         return this.client.getStrangerInfo(user_id);
@@ -16,14 +17,24 @@ class FriendAction {
      * @param message_id {string} 引用的消息ID
      */
     async sendPrivateMsg(user_id, message, message_id) {
+        const forward = message.find(e => e.type === 'node');
+        if (forward)
+            (0, utils_1.remove)(message, forward);
+        let quote = message.find(e => e.type === 'reply');
+        if (quote)
+            (0, utils_1.remove)(message, quote);
         const element = index_1.V12.fromSegment(message);
-        let quote, quoteIdx = element.findIndex(e => e.type === 'reply');
-        if (quoteIdx !== -1) {
-            quote = element[quoteIdx];
-            element.splice(quoteIdx, 1);
-        }
+        if (forward)
+            element.unshift(await this.client.makeForwardMsg(forward.data.message.map(segment => {
+                return {
+                    message: index_1.V12.fromSegment([segment]),
+                    user_id: forward.data.user_id,
+                    nickname: forward.data.user_name,
+                    time: forward.data.time
+                };
+            })));
         if (quote && !message_id)
-            message_id = quote.message_id;
+            message_id = quote.data.message_id;
         return await this.client.sendPrivateMsg(user_id, element, message_id ? await this.client.getMsg(message_id) : undefined);
     }
 }

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupAction = void 0;
 const index_1 = require("../index");
+const utils_1 = require("../../../utils");
 class GroupAction {
     /**
      * 发送群聊消息
@@ -10,14 +11,24 @@ class GroupAction {
      * @param message_id {string} 引用的消息ID
      */
     async sendGroupMsg(group_id, message, message_id) {
+        const forward = message.find(e => e.type === 'node');
+        if (forward)
+            (0, utils_1.remove)(message, forward);
+        let quote = message.find(e => e.type === 'reply');
+        if (quote)
+            (0, utils_1.remove)(message, quote);
         const element = index_1.V12.fromSegment(message);
-        let quote, quoteIdx = element.findIndex(e => e.type === 'reply');
-        if (quoteIdx !== -1) {
-            quote = element[quoteIdx];
-            element.splice(quoteIdx, 1);
-        }
+        if (forward)
+            element.unshift(await this.client.makeForwardMsg(forward.data.message.map(segment => {
+                return {
+                    message: index_1.V12.fromSegment([segment]),
+                    user_id: forward.data.user_id,
+                    nickname: forward.data.user_name,
+                    time: forward.data.time
+                };
+            })));
         if (quote && !message_id)
-            message_id = quote.message_id;
+            message_id = quote.data.message_id;
         return await this.client.sendGroupMsg(group_id, element, message_id ? await this.client.getMsg(message_id) : undefined);
     }
     /**

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

@@ -84,9 +84,14 @@ export declare namespace V12 {
             title: string;
             content: string;
         };
+        node: {
+            user_id: number;
+            time?: number;
+            user_name?: string;
+            message: SegmentElem[];
+        };
         reply: {
             message_id: string;
-            user_id: string;
         };
     }
     type SegmentElem<K extends keyof SegmentMap = keyof SegmentMap> = {

package/lib/utils.d.ts

@@ -7,6 +7,7 @@ export interface Class {
 }
 export declare function Mixin(base: Class, ...classes: Class[]): Class;
 export declare function toHump(action: string): string;
+export declare function remove<T>(list: T[], item: T): void;
 export declare function toLine(name: string): string;
 export declare function toBool(v: any): boolean;
 export declare function uuid(): string;

package/lib/utils.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProperties = exports.protectedFields = exports.uuid = exports.toBool = exports.toLine = exports.toHump = exports.Mixin = exports.omit = exports.pick = exports.deepClone = exports.deepMerge = void 0;
+exports.getProperties = exports.protectedFields = exports.uuid = exports.toBool = exports.toLine = exports.remove = exports.toHump = exports.Mixin = exports.omit = exports.pick = exports.deepClone = exports.deepMerge = void 0;
 const crypto = __importStar(require("crypto"));
 // 合并对象/数组
 function deepMerge(base, ...from) {
@@ -118,6 +118,12 @@ function toHump(action) {
     });
 }
 exports.toHump = toHump;
+function remove(list, item) {
+    const idx = list.indexOf(item);
+    if (idx !== -1)
+        list.splice(idx, 1);
+}
+exports.remove = remove;
 function toLine(name) {
     return name.replace(/([A-Z])/g, "_$1").toLowerCase();
 }

package/package.json

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