onebots 0.1.11 → 0.1.13

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

@@ -11,8 +11,8 @@ export declare class FriendAction {
     /**
      * 发送私聊消息
      * @param user_id {number} 用户id
-     * @param message {import('icqq/lib/service').Sendable} 消息
-     * @param message_id {string} 引用的消息ID
+     * @param message {import('onebots/lib/service/v12').Sendable} 消息
+     * @param quote {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
      */
-    sendPrivateMsg(this: V12, user_id: number, message: V12.Sendable, message_id?: string): Promise<import("icqq").MessageRet>;
+    sendPrivateMsg(this: V12, user_id: number, message: V12.Sendable, quote?: V12.SegmentElem<'reply'>): Promise<import("icqq").MessageRet>;
 }

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

@@ -12,11 +12,11 @@ class FriendAction {
     /**
      * 发送私聊消息
      * @param user_id {number} 用户id
-     * @param message {import('icqq/lib/service').Sendable} 消息
-     * @param message_id {string} 引用的消息ID
+     * @param message {import('onebots/lib/service/v12').Sendable} 消息
+     * @param quote {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
      */
-    async sendPrivateMsg(user_id, message, message_id) {
-        let { element, quote_id } = await utils_1.processMessage.apply(this.client, [message, message_id]);
+    async sendPrivateMsg(user_id, message, quote) {
+        let { element, quote_id } = await utils_1.processMessage.apply(this.client, [message, quote]);
         element = await utils_1.processMusic.apply(this.client, ['friend', user_id, element]);
         if (!element.length)
             return;

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

@@ -4,9 +4,9 @@ export declare class GroupAction {
      * 发送群聊消息
      * @param group_id {number} 群id
      * @param message {import('icqq/lib/service').Sendable} 消息
-     * @param message_id {string} 引用的消息ID
+     * @param quote {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
      */
-    sendGroupMsg(this: V12, group_id: number, message: V12.Sendable, message_id?: string): Promise<import("icqq").MessageRet>;
+    sendGroupMsg(this: V12, group_id: number, message: V12.Sendable, quote?: V12.SegmentElem<'reply'>): Promise<import("icqq").MessageRet>;
     /**
      * 群组踢人
      * @param group_id {number} 群id

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

@@ -7,10 +7,10 @@ class GroupAction {
      * 发送群聊消息
      * @param group_id {number} 群id
      * @param message {import('icqq/lib/service').Sendable} 消息
-     * @param message_id {string} 引用的消息ID
+     * @param quote {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
      */
-    async sendGroupMsg(group_id, message, message_id) {
-        let { element, quote_id } = await utils_1.processMessage.apply(this.client, [message, message_id]);
+    async sendGroupMsg(group_id, message, quote) {
+        let { element, quote_id } = await utils_1.processMessage.apply(this.client, [message, quote]);
         element = await utils_1.processMusic.apply(this.client, ['group', group_id, element]);
         if (!element.length)
             return;

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

@@ -1,7 +1,7 @@
 import { Client, MessageElem } from "icqq";
 import { V12 } from "../../../service/V12";
-export declare function processMusic(this: Client, target_type: 'group' | 'friend', target_id: number, element: any): Promise<any>;
-export declare function processMessage(this: Client, message: V12.Sendable, quote_id?: string): Promise<{
+export declare function processMusic(this: Client, target_type: 'group' | 'friend', target_id: number, element: any[]): Promise<any[]>;
+export declare function processMessage(this: Client, message: V12.Sendable, source?: V12.SegmentElem<'reply'>): Promise<{
     element: MessageElem[];
-    quote_id?: string;
+    quote: V12.SegmentElem<'reply'>;
 }>;

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

@@ -14,7 +14,7 @@ async function processMusic(target_type, target_id, element) {
     return element;
 }
 exports.processMusic = processMusic;
-async function processMessage(message, quote_id) {
+async function processMessage(message, source) {
     let segments = [].concat(message).map(m => {
         if (typeof m === 'string')
             return { type: 'text', data: { text: m } };
@@ -26,8 +26,13 @@ async function processMessage(message, quote_id) {
     let quote = segments.find(e => e.type === 'reply');
     if (quote)
         (0, utils_1.remove)(segments, quote);
-    // 直接发node？不允许，你用forward作为载体吧
-    segments = segments.filter(n => n.type !== 'node');
+    segments = segments.filter(n => [
+        'face', 'text', 'image',
+        'rpx', 'dice', 'poke', 'mention', 'mention_all',
+        'voice', 'file', 'audio',
+        'forward', 'node',
+        'music', 'share', 'xml', 'json', 'location', // 分享类
+    ].includes(n.type));
     const element = V12_1.V12.fromSegment(segments);
     if (forward)
         element.unshift(
@@ -37,14 +42,12 @@ async function processMessage(message, quote_id) {
         forward.data.nodes.filter(n => n.type === 'node').map(async (forwardNode) => {
             return {
                 // 转发套转发处理
-                message: (await processMessage.apply(this, [V12_1.V12.fromSegment(forwardNode.data.message)])).element,
+                message: (await processMessage.apply(this, [forwardNode.data.message])).element,
                 user_id: Number(forwardNode.data.user_id),
                 nickname: forwardNode.data.user_name,
                 time: forwardNode.data.time
             };
         }))));
-    if (quote && !quote_id)
-        quote_id = quote.data.message_id;
-    return { element, quote_id };
+    return { element, quote: quote || source };
 }
 exports.processMessage = processMessage;

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

@@ -68,6 +68,15 @@ export declare namespace V12 {
         mention: {
             user_id: string;
         };
+        rps: {
+            id?: string;
+        };
+        dice: {
+            id?: string;
+        };
+        poke: {
+            user_id: string;
+        };
         mention_all: null;
         image: {
             file_id: string;
@@ -81,9 +90,6 @@ export declare namespace V12 {
         file: {
             file_id: string;
         };
-        forward: {
-            nodes: SegmentElem<'node'>[];
-        };
         music: {
             type: "163" | 'qq' | 'xm' | 'custom';
             id?: string;
@@ -97,12 +103,6 @@ export declare namespace V12 {
             title?: string;
             content?: string;
         };
-        node: {
-            user_id: string;
-            time?: number;
-            user_name?: string;
-            message: SegmentElem[];
-        };
         share: {
             url: string;
             title: string;
@@ -112,6 +112,15 @@ export declare namespace V12 {
         reply: {
             message_id: string;
         };
+        node: {
+            user_id: string;
+            time?: number;
+            user_name?: string;
+            message: SegmentElem[];
+        };
+        forward: {
+            nodes: SegmentElem<'node'>[];
+        };
     }
     type SegmentElem<K extends keyof SegmentMap = keyof SegmentMap> = {
         type: K;

package/lib/service/V12/index.js

@@ -18,6 +18,7 @@ const utils_2 = require("../../utils");
 const db_1 = require("../../db");
 const app_1 = require("../../server/app");
 const fs_1 = require("fs");
+const message_1 = require("icqq/lib/message");
 class V12 extends events_1.EventEmitter {
     constructor(oneBot, client, config) {
         super();
@@ -314,6 +315,16 @@ class V12 extends events_1.EventEmitter {
         if (!data.detail_type)
             data.detail_type = data.message_type || data.notice_type || data.request_type || data.system_type;
         data.message = data.type === 'message' ? V12.toSegment(data.message) : data.message;
+        if (data.source)
+            data.quote = {
+                type: 'reply',
+                data: {
+                    message_id: data.detail_type === 'private' ?
+                        (0, message_1.genDmMessageId)(data.source.user_id, data.source.seq, data.source.rand, data.source.time) :
+                        (0, message_1.genGroupMessageId)(data.group_id, data.source.user_id, data.source.seq, data.source.rand, data.source.time),
+                    user_id: data.source.user_id
+                }
+            };
         return V12.formatPayload(this.oneBot.uin, event, data);
     }
     dispatch(data) {

package/package.json

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