onebots 0.0.19 → 0.0.21

package/lib/onebot.js

@@ -7,6 +7,7 @@ const app_1 = require("./server/app");
 const utils_1 = require("./utils");
 const path_1 = require("path");
 const oicq_1 = require("oicq");
+const message_1 = require("oicq/lib/message");
 const V11_1 = require("./service/V11");
 const V12_1 = require("./service/V12");
 class NotFoundError extends Error {
@@ -118,6 +119,22 @@ class OneBot extends events_1.EventEmitter {
     dispatch(event, data) {
         for (const instance of this.instances) {
             const result = instance.format(event, data);
+            if (data.source) {
+                switch (data.message_type) {
+                    case 'group':
+                        data.message.shift({
+                            type: 'reply',
+                            message_id: (0, message_1.genGroupMessageId)(data.group_id, data.source.user_id, data.source.seq, data.source.rand, data.source.rand, data.source.time)
+                        });
+                        break;
+                    case 'private':
+                        data.message.shift({
+                            type: 'reply',
+                            message_id: (0, message_1.genDmMessageId)(data.source.user_id, data.source.seq, data.source.rand, data.source.rand, data.source.time)
+                        });
+                        break;
+                }
+            }
             instance.dispatch(result);
         }
     }

package/lib/service/V11/action/friend.d.ts

@@ -1,12 +1,14 @@
 import { OneBot } from "../../../onebot";
-import { Sendable } from "oicq";
+import { V11 } from "../../../service/V11";
+import { SegmentElem } from "oicq2-cq-enable/lib/utils";
 export declare class FriendAction {
     /**
      * 发送私聊消息
      * @param user_id {number} 用户id
      * @param message {import('oicq').Sendable} 发送的消息
+     * @param message_id {string} 引用的消息ID
      */
-    sendPrivateMsg(this: OneBot<'V11'>, user_id: number, message: Sendable): Promise<import("oicq").MessageRet>;
+    sendPrivateMsg(this: V11, user_id: number, message: string | SegmentElem[], message_id?: string): Promise<import("oicq").MessageRet>;
     /**
      * 获取好友列表
      */

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

@@ -1,14 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FriendAction = void 0;
+const oicq2_cq_enable_1 = require("oicq2-cq-enable");
 class FriendAction {
     /**
      * 发送私聊消息
      * @param user_id {number} 用户id
      * @param message {import('oicq').Sendable} 发送的消息
+     * @param message_id {string} 引用的消息ID
      */
-    sendPrivateMsg(user_id, message) {
-        return this.client.sendPrivateMsg(user_id, message);
+    async sendPrivateMsg(user_id, message, message_id) {
+        const element = typeof message === 'string' ? (0, oicq2_cq_enable_1.fromCqcode)(message) : (0, oicq2_cq_enable_1.fromSegment)(message);
+        let quote, quoteIdx = element.findIndex(e => e.type === 'reply');
+        if (quoteIdx !== -1) {
+            quote = element[quoteIdx];
+            element.splice(quoteIdx, 1);
+        }
+        if (quote && !message_id)
+            message_id = quote.message_id;
+        return await this.client.sendPrivateMsg(user_id, element, message_id ? await this.client.getMsg(message_id) : undefined);
     }
     /**
      * 获取好友列表

package/lib/service/V11/action/group.d.ts

@@ -1,12 +1,13 @@
-import { Sendable } from "oicq";
 import { V11 } from "../../../service/V11";
+import { SegmentElem } from "oicq2-cq-enable/lib/utils";
 export declare class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
      * @param message {import('oicq').Sendable} 消息
+     * @param message_id {string} 引用的消息ID
      */
-    sendGroupMsg(this: V11, group_id: number, message: Sendable): Promise<import("oicq").MessageRet>;
+    sendGroupMsg(this: V11, group_id: number, message: string | SegmentElem[], message_id?: string): Promise<import("oicq").MessageRet>;
     /**
      * 群组踢人
      * @param group_id {number} 群id

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

@@ -1,14 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupAction = void 0;
+const oicq2_cq_enable_1 = require("oicq2-cq-enable");
 class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
      * @param message {import('oicq').Sendable} 消息
-     */
-    sendGroupMsg(group_id, message) {
-        return this.client.sendGroupMsg(group_id, message);
+     * @param message_id {string} 引用的消息ID
+     */
+    async sendGroupMsg(group_id, message, message_id) {
+        const element = typeof message === 'string' ? (0, oicq2_cq_enable_1.fromCqcode)(message) : (0, oicq2_cq_enable_1.fromSegment)(message);
+        let quote, quoteIdx = element.findIndex(e => e.type === 'reply');
+        if (quoteIdx !== -1) {
+            quote = element[quoteIdx];
+            element.splice(quoteIdx, 1);
+        }
+        if (quote && !message_id)
+            message_id = quote.message_id;
+        return await this.client.sendGroupMsg(group_id, element, message_id ? await this.client.getMsg(message_id) : undefined);
     }
     /**
      * 群组踢人

package/lib/service/V11/index.js

@@ -398,6 +398,7 @@ class V11 extends events_1.EventEmitter {
                         else {
                             params[k] = (0, oicq2_cq_enable_1.fromSegment)(params[k]);
                         }
+                        params['message_id'] = params[k].find(e => e.type === 'reply')?.message_id;
                     }
                     args.push(params[k]);
                 }

package/lib/service/V12/action/common.d.ts

@@ -2,7 +2,7 @@ import { V12 } from '../../../service/V12';
 import { OnlineStatus } from "oicq";
 import { Action } from "./";
 export declare class CommonAction {
-    sendMsg(): void;
+    sendMessage(): void;
     /**
      * 撤回消息
      * @param message_id {string} 消息id

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

@@ -5,7 +5,7 @@ const oicq_1 = require("oicq");
 const onebot_1 = require("../../../onebot");
 const utils_1 = require("../../../utils");
 class CommonAction {
-    sendMsg() { }
+    sendMessage() { }
     /**
      * 撤回消息
      * @param message_id {string} 消息id

package/lib/service/V12/action/friend.d.ts

@@ -1,5 +1,4 @@
 import { V12 } from "../index";
-import { Sendable } from "oicq";
 export declare class FriendAction {
     getUserInfo(this: V12, user_id: number): Promise<{
         user_id: number;
@@ -9,5 +8,11 @@ export declare class FriendAction {
         area: string;
     }>;
     getFriendList(this: V12): Map<number, import("oicq").FriendInfo>;
-    sendPrivateMsg(this: V12, user_id: number, message: Sendable): Promise<import("oicq").MessageRet>;
+    /**
+     * 发送私聊消息
+     * @param user_id {number} 用户id
+     * @param message {import('oicq').Sendable} 发送的消息
+     * @param message_id {string} 引用的消息ID
+     */
+    sendPrivateMsg(this: V12, user_id: number, message: V12.SegmentElem[], message_id?: string): Promise<import("oicq").MessageRet>;
 }

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

@@ -1,6 +1,8 @@
 "use strict";
 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);
@@ -8,8 +10,32 @@ class FriendAction {
     getFriendList() {
         return this.client.getFriendList();
     }
-    sendPrivateMsg(user_id, message) {
-        return this.client.sendPrivateMsg(user_id, message);
+    /**
+     * 发送私聊消息
+     * @param user_id {number} 用户id
+     * @param message {import('oicq').Sendable} 发送的消息
+     * @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);
+        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.data.message_id;
+        return await this.client.sendPrivateMsg(user_id, element, message_id ? await this.client.getMsg(message_id) : undefined);
     }
 }
 exports.FriendAction = FriendAction;

package/lib/service/V12/action/group.d.ts

@@ -1,12 +1,12 @@
 import { V12 } from "../index";
-import { Sendable } from "oicq";
 export declare class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
      * @param message {import('oicq').Sendable} 消息
+     * @param message_id {string} 引用的消息ID
      */
-    sendGroupMsg(this: V12, group_id: number, message: Sendable): Promise<import("oicq").MessageRet>;
+    sendGroupMsg(this: V12, group_id: number, message: V12.SegmentElem[], message_id?: string): Promise<import("oicq").MessageRet>;
     /**
      * 群组踢人
      * @param group_id {number} 群id

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

@@ -1,14 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupAction = void 0;
+const index_1 = require("../index");
+const utils_1 = require("../../../utils");
 class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
      * @param message {import('oicq').Sendable} 消息
-     */
-    sendGroupMsg(group_id, message) {
-        return this.client.sendGroupMsg(group_id, message);
+     * @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);
+        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.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/service/V12/index.js

@@ -36,6 +36,22 @@ class V12 extends events_1.EventEmitter {
         return this.db.get('eventBuffer');
     }
     start(path) {
+        this.client.on('system.online', async () => {
+            this.action.sendPrivateMsg.apply(this, [1659488338, [
+                    {
+                        type: 'reply',
+                        data: {
+                            message_id: 'YunIUgAAD0N494J8Y7u1awE='
+                        }
+                    },
+                    {
+                        type: 'text',
+                        data: {
+                            text: '测试文本'
+                        }
+                    }
+                ]]);
+        });
         this.path = `/${this.client.uin}`;
         if (path)
             this.path += path;
@@ -300,6 +316,7 @@ class V12 extends events_1.EventEmitter {
                         params[k] = (0, utils_1.toBool)(params[k]);
                     if (k === 'message') {
                         params[k] = V12.fromSegment(params[k]);
+                        params['message_id'] = params[k].find(e => e.type === 'reply')?.message_id;
                     }
                     args.push(params[k]);
                 }

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.19",
+  "version": "0.0.21",
   "description": "基于oicq的多例oneBot实现",
   "main": "lib/index.js",
   "bin": {