onebots 0.4.83 → 0.4.86

package/lib/onebot.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { EventEmitter } from "events";
 import { V11 } from "./service/V11";
 import { V12 } from "./service/V12";
@@ -69,5 +68,6 @@ export declare namespace OneBot {
         dispatch(...args: any[]): any;
         apply(...args: any[]): any;
     }
+    type MessageNode<V extends Version> = V extends "V11" ? V11.MessageNode : V12.MessageNode;
 }
 export declare const BOOLS: string[];

package/lib/server/app.d.ts

@@ -1,8 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="koa-bodyparser" />
-/// <reference types="node" />
 import Koa from "koa";
 import * as os from "os";
 import "reflect-metadata";

package/lib/server/app.js

@@ -26,7 +26,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineConfig = exports.createOnebots = exports.App = void 0;
+exports.App = void 0;
+exports.createOnebots = createOnebots;
+exports.defineConfig = defineConfig;
 const koa_1 = __importDefault(require("koa"));
 const os = __importStar(require("os"));
 require("reflect-metadata");
@@ -369,11 +371,9 @@ function createOnebots(config = "config.yaml", cp = null) {
         process_1.default.on("disconnect", () => cp.kill());
     return new App(config);
 }
-exports.createOnebots = createOnebots;
 function defineConfig(config) {
     return config;
 }
-exports.defineConfig = defineConfig;
 (function (App) {
     App.ADAPTERS = new Map();
     App.defaultConfig = {

package/lib/server/router.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="koa__router" />
 import KoaRouter from "@koa/router";
 import { WebSocketServer, WebSocket, ServerOptions } from "ws";
 import { IncomingMessage, Server } from "http";

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

@@ -7,6 +7,12 @@ export declare class FriendAction {
      * @param message_id {number} 引用的消息ID
      */
     sendPrivateMsg(this: V11, user_id: number, message: V11.Sendable, message_id?: number): Promise<V11.MessageRet>;
+    /**
+     * 发送转发消息
+     * @param user_id {number} 用户id
+     * @param messages {V11.MessageNode[]} 转发节点
+     */
+    sendPrivateForwardMsg(this: V11, user_id: number, messages: V11.MessageNode[]): Promise<any>;
     /**
      * 获取好友列表
      */

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

@@ -17,6 +17,18 @@ class FriendAction {
             msg_id,
         ]);
     }
+    /**
+     * 发送转发消息
+     * @param user_id {number} 用户id
+     * @param messages {V11.MessageNode[]} 转发节点
+     */
+    async sendPrivateForwardMsg(user_id, messages) {
+        const uid = this.getStrByInt("user_id", user_id);
+        return this.adapter.call(this.oneBot.uin, "V11", "sendPrivateForwardMessage", [
+            uid,
+            messages,
+        ]);
+    }
     /**
      * 获取好友列表
      */

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

@@ -7,6 +7,12 @@ export declare class GroupAction {
      * @param message_id {number} 引用的消息ID
      */
     sendGroupMsg(this: V11, group_id: number, message: V11.Sendable, message_id?: number): Promise<V11.MessageRet>;
+    /**
+     * 发送群聊转发消息
+     * @param group_id {number} 群id
+     * @param messages {V11.MessageNode[]} 转发消息内容
+     */
+    sendGroupForwardMsg(this: V11, group_id: number, messages: V11.MessageNode[]): Promise<any>;
     /**
      * 群组踢人
      * @param group_id {number} 群id

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

@@ -17,6 +17,18 @@ class GroupAction {
             msg_id,
         ]);
     }
+    /**
+     * 发送群聊转发消息
+     * @param group_id {number} 群id
+     * @param messages {V11.MessageNode[]} 转发消息内容
+     */
+    async sendGroupForwardMsg(group_id, messages) {
+        const gid = this.getStrByInt("group_id", group_id);
+        return this.adapter.call(this.oneBot.uin, "V11", "sendGroupForwardMessage", [
+            gid,
+            messages,
+        ]);
+    }
     /**
      * 群组踢人
      * @param group_id {number} 群id

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Config } from "./config";
 import { Action } from "./action";
 import { OneBot, OneBotStatus } from "../../onebot";
@@ -129,6 +128,11 @@ export declare namespace V11 {
     interface Message {
         message: Sendable;
     }
+    type MessageNode = {
+        uin: number;
+        name: string;
+        content: Sendable;
+    };
     interface MessageRet {
         message_id: number;
     }

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Config } from "./config";
 import { OneBot } from "../../onebot";
 import { Action } from "./action";
@@ -192,6 +191,11 @@ export declare namespace V12 {
     interface Message {
         message: Sendable;
     }
+    type MessageNode = {
+        uin: number;
+        name: string;
+        content: Sendable;
+    };
     interface Message {
     }
     interface MessageRet {

package/lib/service.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { EventEmitter } from "events";
 import { OneBot } from "./onebot";
 import { Dict } from "@zhinjs/shared";

package/lib/service.js

@@ -74,7 +74,7 @@ exports.Service = Service;
                 value.length === 2 &&
                 value.every(item => typeof item === "number")) {
                 const [start, end] = value;
-                return event >= start && event <= end;
+                return Number(event) >= start && Number(event) <= end;
             }
             if (Array.isArray(value)) {
                 return value.includes(event[key]);

package/lib/utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Dict } from "@zhinjs/shared";
 import * as fs from "fs";
 export declare const version: any;

package/lib/utils.js

@@ -23,7 +23,27 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringifyObj = exports.parseObjFromStr = exports.getDataKeyOfObj = exports.getValueOfObj = exports.setValueToObj = exports.getProperties = exports.protectedFields = exports.randomInt = exports.uuid = exports.toBool = exports.remove = exports.toHump = exports.Mixin = exports.toLine = exports.omit = exports.pick = exports.deepClone = exports.transformObj = exports.deepMerge = exports.readLine = exports.version = void 0;
+exports.version = void 0;
+exports.readLine = readLine;
+exports.deepMerge = deepMerge;
+exports.transformObj = transformObj;
+exports.deepClone = deepClone;
+exports.pick = pick;
+exports.omit = omit;
+exports.toLine = toLine;
+exports.Mixin = Mixin;
+exports.toHump = toHump;
+exports.remove = remove;
+exports.toBool = toBool;
+exports.uuid = uuid;
+exports.randomInt = randomInt;
+exports.protectedFields = protectedFields;
+exports.getProperties = getProperties;
+exports.setValueToObj = setValueToObj;
+exports.getValueOfObj = getValueOfObj;
+exports.getDataKeyOfObj = getDataKeyOfObj;
+exports.parseObjFromStr = parseObjFromStr;
+exports.stringifyObj = stringifyObj;
 const crypto = __importStar(require("crypto"));
 const fs = __importStar(require("fs"));
 const readline = __importStar(require("readline"));
@@ -47,7 +67,6 @@ function readLine(maxLen, ...params) {
         rl.on("error", reject);
     });
 }
-exports.readLine = readLine;
 // 合并对象/数组
 function deepMerge(base, ...from) {
     if (base === null || base === undefined)
@@ -78,7 +97,6 @@ function deepMerge(base, ...from) {
     }
     return base;
 }
-exports.deepMerge = deepMerge;
 function transformObj(obj, callback) {
     if (!obj)
         return obj;
@@ -90,7 +108,6 @@ function transformObj(obj, callback) {
         return [key, callback(key, obj[key])];
     }));
 }
-exports.transformObj = transformObj;
 // 深拷贝
 function deepClone(obj) {
     if (typeof obj !== "object")
@@ -113,7 +130,6 @@ function deepClone(obj) {
     }
     return objClone;
 }
-exports.deepClone = deepClone;
 function pick(source, keys, forced) {
     if (!keys)
         return { ...source };
@@ -124,7 +140,6 @@ function pick(source, keys, forced) {
     }
     return result;
 }
-exports.pick = pick;
 function omit(source, keys) {
     if (!keys)
         return { ...source };
@@ -134,7 +149,6 @@ function omit(source, keys) {
     }
     return result;
 }
-exports.omit = omit;
 /**
  * 将驼峰命名替换为下划线分割命名
  * @param name
@@ -144,7 +158,6 @@ exports.omit = omit;
 function toLine(name) {
     return name.replace(/([A-Z])/g, "_$1").toLowerCase();
 }
-exports.toLine = toLine;
 function Mixin(base, ...classes) {
     classes.forEach(ctr => {
         Object.getOwnPropertyNames(ctr.prototype).forEach(name => {
@@ -155,25 +168,21 @@ function Mixin(base, ...classes) {
     });
     return base;
 }
-exports.Mixin = Mixin;
 function toHump(action) {
     return action.replace(/_[\w]/g, s => {
         return s[1].toUpperCase();
     });
 }
-exports.toHump = toHump;
 function remove(list, item) {
     const idx = list.indexOf(item);
     if (idx !== -1)
         list.splice(idx, 1);
 }
-exports.remove = remove;
 function toBool(v) {
     if (v === "0" || v === "false")
         v = false;
     return Boolean(v);
 }
-exports.toBool = toBool;
 function uuid() {
     let hex = crypto.randomBytes(16).toString("hex");
     return (hex.substr(0, 8) +
@@ -186,14 +195,12 @@ function uuid() {
         "-" +
         hex.substr(20));
 }
-exports.uuid = uuid;
 function randomInt(...args) {
     let min = args[0] || 0, max = args[1];
     if (args.length === 1)
         (max = min), (min = 0);
     return Math.floor(Math.random() * (max - min) + min);
 }
-exports.randomInt = randomInt;
 function protectedFields(source, ...keys) {
     const protocolValue = value => {
         if (value && typeof value === "object")
@@ -211,7 +218,6 @@ function protectedFields(source, ...keys) {
         return [key, keys.includes(key) ? protocolValue(value) : value];
     }));
 }
-exports.protectedFields = protectedFields;
 function getProperties(obj) {
     if (obj.__proto__ === null) {
         //说明该对象已经是最顶层的对象
@@ -219,7 +225,6 @@ function getProperties(obj) {
     }
     return Object.getOwnPropertyNames(obj).concat(getProperties(obj.__proto__));
 }
-exports.getProperties = getProperties;
 function setValueToObj(obj, key, value) {
     const keys = Array.isArray(key) ? key : key.split(".").filter(Boolean);
     const lastKey = keys.pop();
@@ -233,7 +238,6 @@ function setValueToObj(obj, key, value) {
     }
     return Reflect.set(obj, lastKey, value);
 }
-exports.setValueToObj = setValueToObj;
 function getValueOfObj(obj, key) {
     const keys = Array.isArray(key) ? key : key.split(".").filter(Boolean);
     const lastKey = keys.pop();
@@ -247,7 +251,6 @@ function getValueOfObj(obj, key) {
     }
     return Reflect.get(obj, lastKey);
 }
-exports.getValueOfObj = getValueOfObj;
 function getDataKeyOfObj(data, obj) {
     const _get = (data, obj, prefix) => {
         for (const [key, value] of Object.entries(obj)) {
@@ -262,7 +265,6 @@ function getDataKeyOfObj(data, obj) {
     };
     return _get(data, obj, []);
 }
-exports.getDataKeyOfObj = getDataKeyOfObj;
 function parseObjFromStr(str) {
     const result = JSON.parse(str);
     const format = (data, keys) => {
@@ -280,7 +282,6 @@ function parseObjFromStr(str) {
     format(result, []);
     return result;
 }
-exports.parseObjFromStr = parseObjFromStr;
 function stringifyObj(value) {
     if (!value || typeof value !== "object")
         return value;
@@ -311,4 +312,3 @@ function stringifyObj(value) {
     _stringify(value, []);
     return JSON.stringify(result, (_, v) => (typeof v === "bigint" ? v.toString() : v), 2);
 }
-exports.stringifyObj = stringifyObj;

package/package.json

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