onebots 0.1.10 → 0.1.12

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').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.SegmentElem[], 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').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

@@ -3,10 +3,10 @@ export declare class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
-     * @param message {import('icqq').Sendable} 消息
-     * @param message_id {string} 引用的消息ID
+     * @param message {import('icqq/lib/service').Sendable} 消息
+     * @param quote {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
      */
-    sendGroupMsg(this: V12, group_id: number, message: V12.SegmentElem[], 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

@@ -6,11 +6,11 @@ class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
-     * @param message {import('icqq').Sendable} 消息
-     * @param message_id {string} 引用的消息ID
+     * @param message {import('icqq/lib/service').Sendable} 消息
+     * @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/guild.d.ts

@@ -1,5 +1,4 @@
 import { V12 } from "../../../service/V12";
-import SegmentElem = V12.SegmentElem;
 export declare class GuildAction {
     getGuildList(this: V12): {
         guild_id: string;
@@ -12,7 +11,13 @@ export declare class GuildAction {
         channel_type: import("icqq/lib/channel").ChannelType;
     }[];
     getGuildMemberList(this: V12, guild_id: string): never[] | Promise<import("icqq/lib/guild").GuildMember[]>;
-    sendGuildMsg(this: V12, guild_id: string, channel_id: string, message: SegmentElem[]): Promise<{
+    /**
+     * 发送群聊消息
+     * @param guild_id {number} 频道id
+     * @param channel_id {string} 子频道id
+     * @param message {import('icqq/lib/service').Sendable} 消息
+     */
+    sendGuildMsg(this: V12, guild_id: string, channel_id: string, message: V12.Sendable): Promise<{
         seq: number;
         rand: number;
         time: number;

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

@@ -12,6 +12,12 @@ class GuildAction {
     getGuildMemberList(guild_id) {
         return this.client.getGuildMemberList(guild_id);
     }
+    /**
+     * 发送群聊消息
+     * @param guild_id {number} 频道id
+     * @param channel_id {string} 子频道id
+     * @param message {import('icqq/lib/service').Sendable} 消息
+     */
     async sendGuildMsg(guild_id, channel_id, message) {
         const { element } = await utils_1.processMessage.apply(this.client, [message]);
         if (!element.length)

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.SegmentElem[], quote_id?: string): Promise<{
+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,16 +14,25 @@ async function processMusic(target_type, target_id, element) {
     return element;
 }
 exports.processMusic = processMusic;
-async function processMessage(message, quote_id) {
-    const forward = message.find(e => e.type === 'forward');
+async function processMessage(message, source) {
+    let segments = [].concat(message).map(m => {
+        if (typeof m === 'string')
+            return { type: 'text', data: { text: m } };
+        return m;
+    });
+    const forward = segments.find(e => e.type === 'forward');
     if (forward)
-        (0, utils_1.remove)(message, forward);
-    let quote = message.find(e => e.type === 'reply');
+        (0, utils_1.remove)(segments, forward);
+    let quote = segments.find(e => e.type === 'reply');
     if (quote)
-        (0, utils_1.remove)(message, quote);
-    // 直接发node？不允许，你用forward作为载体吧
-    message = message.filter(n => n.type !== 'node');
-    const element = V12_1.V12.fromSegment(message);
+        (0, utils_1.remove)(segments, quote);
+    segments = segments.filter(n => [
+        'face', 'text', 'image',
+        'rpx', 'dice', 'poke', 'mention', 'mention_all',
+        'voice', 'file', 'audio',
+        'music', 'share', 'xml', 'json', 'location', // 分享类
+    ].includes(n.type));
+    const element = V12_1.V12.fromSegment(segments);
     if (forward)
         element.unshift(
         // 构造抓发消息
@@ -38,8 +47,6 @@ async function processMessage(message, quote_id) {
                 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

@@ -1,13 +1,12 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { Client, EventMap, MessageElem, Sendable } from "icqq";
+import { Client, EventMap, MessageElem, Sendable as IcqqCanSend } from "icqq";
 import { Config } from './config';
 import { OneBot } from "../../onebot";
 import { Action } from "./action";
 import { EventEmitter } from "events";
 import { Logger } from "log4js";
 import { WebSocket, WebSocketServer } from "ws";
-import Payload = V12.Payload;
 export declare class V12 extends EventEmitter implements OneBot.Base {
     oneBot: OneBot<'V12'>;
     client: Client;
@@ -22,8 +21,8 @@ export declare class V12 extends EventEmitter implements OneBot.Base {
     wsr: Set<WebSocket>;
     private db;
     constructor(oneBot: OneBot<'V12'>, client: Client, config: V12.Config);
-    get history(): Payload<keyof Action>[];
-    set history(value: Payload<keyof Action>[]);
+    get history(): V12.Payload<keyof Action>[];
+    set history(value: V12.Payload<keyof Action>[]);
     start(path?: string): void;
     private startHttp;
     private startWebhook;
@@ -55,8 +54,9 @@ export declare class V12 extends EventEmitter implements OneBot.Base {
     protected _webSocketHandler(ws: WebSocket): void;
 }
 export declare namespace V12 {
-    function fromSegment(msgList: SegmentElem | string | number | (SegmentElem | string | number)[]): MessageElem[];
-    function toSegment(msgList: Sendable): SegmentElem<keyof SegmentMap>[];
+    type Sendable = string | SegmentElem | (string | SegmentElem)[];
+    function fromSegment(msgList: Sendable[]): MessageElem[];
+    function toSegment(msgList: IcqqCanSend): SegmentElem<keyof SegmentMap>[];
     interface SegmentMap {
         face: {
             id: number;
@@ -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.10",
+  "version": "0.1.12",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"