onebots 0.1.9 → 0.1.11

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 {import('icqq/lib/service').Sendable} 消息
      * @param message_id {string} 引用的消息ID
      */
-    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, message_id?: string): Promise<import("icqq").MessageRet>;
 }

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

@@ -12,7 +12,7 @@ class FriendAction {
     /**
      * 发送私聊消息
      * @param user_id {number} 用户id
-     * @param message {import('icqq').Sendable} 发送的消息
+     * @param message {import('icqq/lib/service').Sendable} 消息
      * @param message_id {string} 引用的消息ID
      */
     async sendPrivateMsg(user_id, message, message_id) {

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 {import('icqq/lib/service').Sendable} 消息
      * @param message_id {string} 引用的消息ID
      */
-    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, message_id?: string): Promise<import("icqq").MessageRet>;
     /**
      * 群组踢人
      * @param group_id {number} 群id

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

@@ -6,7 +6,7 @@ class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
-     * @param message {import('icqq').Sendable} 消息
+     * @param message {import('icqq/lib/service').Sendable} 消息
      * @param message_id {string} 引用的消息ID
      */
     async sendGroupMsg(group_id, message, message_id) {

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, quote_id?: string): Promise<{
     element: MessageElem[];
     quote_id?: string;
 }>;

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

@@ -15,19 +15,26 @@ async function processMusic(target_type, target_id, element) {
 }
 exports.processMusic = processMusic;
 async function processMessage(message, quote_id) {
-    const forwardNodes = message.filter(e => e.type === 'node');
-    if (forwardNodes.length)
-        message = message.filter((segment) => !forwardNodes.includes(segment));
-    let quote = message.find(e => e.type === 'reply');
+    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)(segments, forward);
+    let quote = segments.find(e => e.type === 'reply');
     if (quote)
-        (0, utils_1.remove)(message, quote);
-    const element = V12_1.V12.fromSegment(message);
-    if (forwardNodes)
+        (0, utils_1.remove)(segments, quote);
+    // 直接发node？不允许，你用forward作为载体吧
+    segments = segments.filter(n => n.type !== 'node');
+    const element = V12_1.V12.fromSegment(segments);
+    if (forward)
         element.unshift(
         // 构造抓发消息
         await this.makeForwardMsg(await Promise.all(
         // 处理转发消息段
-        forwardNodes.map(async (forwardNode) => {
+        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,

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;
@@ -81,6 +81,9 @@ export declare namespace V12 {
         file: {
             file_id: string;
         };
+        forward: {
+            nodes: SegmentElem<'node'>[];
+        };
         music: {
             type: "163" | 'qq' | 'xm' | 'custom';
             id?: string;

package/package.json

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