onebots 0.4.25 → 0.4.27

package/README.md

@@ -45,6 +45,7 @@ npm init -y
 
 ```shell
 npm install onebots icqq
+npm install sqlite3 # 如果你需要使用 OneBot11 请自行安装该依赖
 ```
 
 ## 3. 执行如下命令生成配置文件

package/lib/adapters/qq/bot.d.ts

@@ -1,7 +1,6 @@
 import type { QQAdapter } from "../../adapters/qq";
 import { AxiosInstance } from "axios";
 import { WebSocket } from "ws";
-import { SessionManager } from "../../adapters/qq/sessionManager";
 import { OneBot } from "../../onebot";
 import { QQBot } from "../../adapters/qq/qqBot";
 export declare class Bot extends QQBot {
@@ -12,7 +11,6 @@ export declare class Bot extends QQBot {
     nickname: string;
     status: number;
     ws: WebSocket;
-    sessionManager: SessionManager;
     constructor(oneBot: OneBot, appId: string, config: QQAdapter.Config['protocol']);
     init(): Promise<void>;
     stop(): void;

package/lib/adapters/qq/bot.js

@@ -6,6 +6,7 @@ class Bot extends qqBot_1.QQBot {
     constructor(oneBot, appId, config) {
         super({
             appid: appId,
+            logLevel: oneBot.app.config.log_level,
             ...config
         });
         this.oneBot = oneBot;

package/lib/adapters/qq/elements.d.ts

@@ -87,6 +87,9 @@ export interface MessageElemMap {
         res_id?: string;
         data: string | Record<string, any>;
     };
+    node: {
+        message: Sendable;
+    };
     markdown: {
         content: string;
     };
@@ -105,7 +108,8 @@ export interface MessageElemMap {
 export type MessageElemType = keyof MessageElemMap;
 export type MessageElem<T extends MessageElemType = MessageElemType> = {
     type: T;
-} & MessageElemMap[T];
+    data: MessageElemMap[T];
+};
 export type TextElem = MessageElem<"text">;
 export type AtElem = MessageElem<"at">;
 export type FaceElem = MessageElem<"face">;
@@ -116,10 +120,11 @@ export type LinkElem = MessageElem<'link'>;
 export type XmlElem = MessageElem<"xml">;
 export type JsonElem = MessageElem<"json">;
 export type MDElem = MessageElem<'markdown'>;
+export type NodeElem = MessageElem<"node">;
 export type MusicElem = MessageElem<"music">;
 export type ButtonElem = MessageElem<'button'>;
 export type ReplyElem = MessageElem<"reply">;
 type RepeatableCombineElem = TextElem | FaceElem | ImageElem | AtElem | ButtonElem;
 type WithReply<T extends MessageElem> = T | [T] | [ReplyElem, T] | [ReplyElem, ...RepeatableCombineElem[]];
-export type Sendable = string | RepeatableCombineElem | (RepeatableCombineElem | string)[] | WithReply<MDElem | LinkElem | VideoElem | AudioElem | XmlElem | MusicElem | JsonElem>;
+export type Sendable = string | RepeatableCombineElem | (RepeatableCombineElem | string)[] | WithReply<MDElem | NodeElem | LinkElem | VideoElem | AudioElem | XmlElem | MusicElem | JsonElem>;
 export {};

package/lib/adapters/qq/index.d.ts

@@ -1,6 +1,7 @@
 import { Adapter } from "../../adapter";
 import { App } from "../../server/app";
 import { OneBot } from "../../onebot";
+import { QQBot } from "../../adapters/qq/qqBot";
 export default class QQAdapter extends Adapter<'qq'> {
     #private;
     constructor(app: App, config: QQAdapter.Config);
@@ -24,12 +25,6 @@ declare module '../../adapter' {
 }
 export declare namespace QQAdapter {
     interface Config extends Adapter.Config<'qq'> {
-        protocol: {
-            secret: string;
-            token: string;
-            sandbox?: boolean;
-            maxRetry?: number;
-            intents?: string[];
-        };
+        protocol: Omit<QQBot.Config, 'appid'>;
     }
 }

package/lib/adapters/qq/index.js

@@ -117,13 +117,13 @@ class QQAdapter extends adapter_1.Adapter {
                 if (value instanceof Array)
                     return `${key}=${value.map(v => JSON.stringify(v)).join(',')}`;
                 // is String
-                return `${key}=${item.data[key]}`;
+                return `${key}=${item[key]}`;
             });
             return `[CQ:${item.type},${dataStr.join(',')}]`;
         }).join('');
     }
     formatEventPayload(version, event, data) {
-        return {
+        const result = {
             id: data.id,
             type: event,
             version: version,
@@ -135,6 +135,8 @@ class QQAdapter extends adapter_1.Adapter {
             platform: 'qq',
             ...data,
         };
+        delete data.bot;
+        return result;
     }
     async start(uin) {
         const startOneBots = [...this.oneBots.values()].filter(oneBot => {

package/lib/adapters/qq/message.d.ts

@@ -5,11 +5,12 @@ import { Bot } from "./bot";
 export declare class Message {
     bot: Bot;
     sub_type: Message.SubType;
-    get self_id(): string;
+    self_id: string;
     guild_id?: string;
     channel_id?: string;
     group_id?: string;
     message_id: string;
+    seq: number;
     sender: Message.Sender;
     user_id: string;
     constructor(bot: Bot, attrs: Partial<Message>);
@@ -46,7 +47,7 @@ export declare class GroupMessageEvent extends Message implements MessageEvent {
 }
 export declare class DirectMessageEvent extends Message implements MessageEvent {
     user_id: string;
-    channel_id: string;
+    guild_id: string;
     constructor(bot: Bot, payload: Partial<Message>);
     reply(message: Sendable): Promise<{
         message_id: string;
@@ -71,7 +72,7 @@ export declare namespace Message {
         user_id: string;
         user_name: string;
     }
-    type SubType = 'private' | 'group' | 'guild' | 'direct';
+    type SubType = "private" | "group" | "guild" | "direct";
     function parse(this: QQBot, payload: Dict): (string | MessageElem[])[];
     function format(this: QQBot, message: Sendable, source?: Quotable): Promise<{
         messages: Dict;

package/lib/adapters/qq/message.js

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GuildMessageEvent = exports.DirectMessageEvent = exports.GroupMessageEvent = exports.PrivateMessageEvent = exports.Message = void 0;
-const qqBot_1 = require("./qqBot");
 const utils_1 = require("./utils");
 const crypto_1 = require("crypto");
+const bot_1 = require("./bot");
 class Message {
-    get self_id() {
-        return this.bot.self_id;
-    }
     constructor(bot, attrs) {
         this.bot = bot;
         Object.assign(this, attrs);
+        this.self_id = bot.self_id;
+        this.seq = attrs.seq || (0, crypto_1.randomInt)(1000000);
     }
     get [Symbol.unscopables]() {
         return {
@@ -20,7 +19,8 @@ class Message {
     toJSON() {
         return Object.fromEntries(Object.keys(this)
             .filter(key => {
-            return typeof this[key] !== "function" && !(this[key] instanceof qqBot_1.QQBot);
+            console.log(key, typeof this[key]);
+            return typeof this[key] !== "function" && !(this[key] instanceof bot_1.Bot);
         })
             .map(key => [key, this[key]]));
     }
@@ -29,7 +29,7 @@ exports.Message = Message;
 class PrivateMessageEvent extends Message {
     constructor(bot, payload) {
         super(bot, payload);
-        this.sub_type = 'private';
+        this.sub_type = "private";
     }
     async reply(message) {
         return this.bot.sendPrivateMessage(this.user_id, message, this);
@@ -39,7 +39,7 @@ exports.PrivateMessageEvent = PrivateMessageEvent;
 class GroupMessageEvent extends Message {
     constructor(bot, payload) {
         super(bot, payload);
-        this.sub_type = 'group';
+        this.sub_type = "group";
     }
     async reply(message) {
         return this.bot.sendGroupMessage(this.group_id, message, this);
@@ -49,7 +49,7 @@ exports.GroupMessageEvent = GroupMessageEvent;
 class DirectMessageEvent extends Message {
     constructor(bot, payload) {
         super(bot, payload);
-        this.sub_type = 'direct';
+        this.sub_type = "direct";
     }
     reply(message) {
         return this.bot.sendDirectMessage(this.guild_id, message, this);
@@ -59,7 +59,7 @@ exports.DirectMessageEvent = DirectMessageEvent;
 class GuildMessageEvent extends Message {
     constructor(bot, payload) {
         super(bot, payload);
-        this.sub_type = 'guild';
+        this.sub_type = "guild";
     }
     async asAnnounce() {
         return this.bot.setChannelAnnounce(this.guild_id, this.channel_id, this.message_id);
@@ -74,9 +74,9 @@ class GuildMessageEvent extends Message {
 exports.GuildMessageEvent = GuildMessageEvent;
 (function (Message) {
     function parse(payload) {
-        let template = payload.content || '';
+        let template = payload.content || "";
         let result = [];
-        let brief = '';
+        let brief = "";
         // 1. 处理文字表情混排
         const regex = /("[^"]*?"|'[^']*?'|`[^`]*?`|“[^”]*?”|‘[^’]*?’|<[^>]+?>)/;
         while (template.length) {
@@ -87,48 +87,61 @@ exports.GuildMessageEvent = GuildMessageEvent;
             const prevText = template.slice(0, index);
             if (prevText) {
                 result.push({
-                    type: 'text',
-                    text: prevText
+                    type: "text",
+                    data: {
+                        text: prevText
+                    }
                 });
                 brief += prevText;
             }
             template = template.slice(index + match.length);
-            if (match.startsWith('<')) {
-                let [type, ...attrs] = match.slice(1, -1).split(',');
-                if (type.startsWith('faceType')) {
-                    type = 'face';
-                    attrs = attrs.map((attr) => attr.replace('faceId', 'id'));
+            if (match.startsWith("<")) {
+                let [type, ...attrs] = match.slice(1, -1).split(",");
+                if (type.startsWith("faceType")) {
+                    type = "face";
+                    attrs = attrs.map((attr) => attr.replace("faceId", "id"));
                 }
-                else if (type.startsWith('@')) {
-                    if (type.startsWith('@!')) {
+                else if (type.startsWith("@")) {
+                    if (type.startsWith("@!")) {
                         const id = type.slice(2);
-                        type = 'at';
+                        type = "at";
                         attrs = Object.entries(payload.mentions.find((u) => u.id === id) || {})
                             .map(([key, value]) => `${key}=${value}`);
                     }
-                    else if (type === '@everyone') {
-                        type = 'at';
-                        attrs = [['all', true]];
+                    else if (type === "@everyone") {
+                        type = "at";
+                        attrs = [["all", true]];
                     }
                 }
                 else if (/^[a-z]+:[0-9]+$/.test(type)) {
-                    attrs = [['id', type.split(':')[1]]];
-                    type = 'face';
+                    attrs = [["id", type.split(":")[1]]];
+                    type = "face";
                 }
                 result.push({
                     type,
-                    ...Object.fromEntries(attrs.map((attr) => {
-                        const [key, ...values] = attr.split('=');
-                        return [key.toLowerCase(), (0, utils_1.trimQuote)(values.join('='))];
+                    data: Object.fromEntries(attrs.map((attr) => {
+                        const [key, ...values] = attr.split("=");
+                        return [key.toLowerCase(), (0, utils_1.trimQuote)(values.join("="))];
                     }))
                 });
-                brief += `<${type}:${attrs.join(',')}>`;
+                brief += `<${type}:${attrs.join(",")}>`;
+            }
+            else {
+                result.push({
+                    type: "text",
+                    data: {
+                        text: match
+                    }
+                });
+                brief += match;
             }
         }
         if (template) {
             result.push({
-                type: 'text',
-                text: template
+                type: "text",
+                data: {
+                    text: template
+                }
             });
             brief += template;
         }
@@ -136,14 +149,14 @@ exports.GuildMessageEvent = GuildMessageEvent;
         if (payload.attachments) {
             for (const attachment of payload.attachments) {
                 let { content_type, ...data } = attachment;
-                const [type] = content_type.split('/');
+                const [type] = content_type.split("/");
                 result.push({
                     type,
                     ...data,
                     src: data.src || data.url,
                     url: data.url || data.src
                 });
-                brief += `<$${type},${Object.entries(data).map(([key, value]) => `${key}=${value}`).join(',')}>`;
+                brief += `<$${type},${Object.entries(data).map(([key, value]) => `${key}=${value}`).join(",")}>`;
             }
         }
         delete payload.attachments;
@@ -153,12 +166,12 @@ exports.GuildMessageEvent = GuildMessageEvent;
     Message.parse = parse;
     async function format(message, source = {}) {
         const getType = (type) => {
-            return ['image', 'video', 'audio'].indexOf(type) + 1;
+            return ["image", "video", "audio"].indexOf(type) + 1;
         };
-        let brief = '';
+        let brief = "";
         const messages = {
             msg_type: 0,
-            content: '',
+            content: "",
             msg_id: source?.message_id,
             msg_seq: (0, crypto_1.randomInt)(1, 1000000),
             timestamp: Number((Date.now() / 1000).toFixed(0))
@@ -172,74 +185,83 @@ exports.GuildMessageEvent = GuildMessageEvent;
         if (!Array.isArray(message))
             message = [message];
         for (let elem of message) {
-            if (typeof elem === 'string') {
-                elem = { type: 'text', text: elem };
+            if (typeof elem === "string") {
+                elem = { type: "text", data: { text: elem } };
             }
             switch (elem.type) {
-                case 'reply':
-                    messages.msg_id = elem.message_id;
-                    files.msg_id = elem.message_id;
-                    brief += `<$reply,message_id=${elem.message_id}>`;
+                case "reply":
+                    messages.msg_id = elem.data.message_id;
+                    files.msg_id = elem.data.message_id;
+                    brief += `<$reply,message_id=${elem.data.message_id}>`;
                     break;
                 case "at":
                     if (messages.content) {
-                        messages.content += `<@${elem.id || 'everyone'}>`;
+                        messages.content += `<@${elem.data.id || "everyone"}>`;
                     }
                     else {
-                        messages.content = `<@${elem.id || 'everyone'}>`;
+                        messages.content = `<@${elem.data.id || "everyone"}>`;
                     }
-                    brief += `<$at,user=${elem.id || 'everyone'}>`;
+                    brief += `<$at,user=${elem.data.id || "everyone"}>`;
                     break;
-                case 'link':
+                case "link":
                     if (messages.content) {
-                        messages.content += `<#${elem.channel_id}>`;
+                        messages.content += `<#${elem.data.channel_id}>`;
                     }
                     else {
-                        messages.content = `<#${elem.channel_id}>`;
+                        messages.content = `<#${elem.data.channel_id}>`;
                     }
-                    brief += `<$link,channel=${elem.channel_id}>`;
+                    brief += `<$link,channel=${elem.data.channel_id}>`;
                     break;
-                case 'text':
+                case "text":
                     if (messages.content) {
-                        messages.content += elem.text;
+                        messages.content += elem.data.text;
                     }
                     else {
-                        messages.content = elem.text;
+                        messages.content = elem.data.text;
                     }
                     hasMessages = true;
-                    brief += elem.text;
+                    brief += elem.data.text;
                     break;
-                case 'face':
+                case "face":
                     if (messages.content) {
-                        messages.content += `<emoji:${elem.id}>`;
+                        messages.content += `<emoji:${elem.data.id}>`;
                     }
                     else {
-                        messages.content = `<emoji:${elem.id}>`;
+                        messages.content = `<emoji:${elem.data.id}>`;
                     }
-                    brief += `<$face,id=${elem.id}>`;
+                    brief += `<$face,id=${elem.data.id}>`;
                     hasMessages = true;
                     break;
-                case 'image':
-                case 'audio':
-                case 'video':
+                case "node":
+                    const { messages: m, hasFiles: hf, hasMessages: hm, brief: b, files: f } = await format.call(this, elem.data.message);
+                    messages.content += m.content;
+                    messages.msg_id = messages.msg_id || m.msg_id;
+                    hasMessages = hasMessages || hm;
+                    hasFiles = hasFiles || hf;
+                    brief += b;
+                    Object.assign(files, f);
+                    break;
+                case "image":
+                case "audio":
+                case "video":
                     files.file_type = getType(elem.type);
-                    files.content = 'file';
-                    files.url = elem.file;
+                    files.content = "file";
+                    files.url = elem.data.file;
                     files.event_id = source.event_id;
                     files.msg_id = source?.message_id;
                     files.srv_send_msg = true;
                     hasFiles = true;
-                    brief += `<${elem.type},file=${elem.file}>`;
+                    brief += `<${elem.type},file=${elem.data.file}>`;
                     break;
-                case 'markdown':
+                case "markdown":
                     messages.markdown = {
-                        content: elem.content
+                        content: elem.data.content
                     };
                     messages.msg_type = 2;
                     hasMessages = true;
-                    brief += `<#markdown,content=${elem.content}>`;
+                    brief += `<#markdown,content=${elem.data.content}>`;
                     break;
-                case 'button':
+                case "button":
                     buttons.push(elem.data);
                     brief += `<$button,data=${JSON.stringify(elem.data)}>`;
                     break;

package/lib/adapters/qq/qqBot.d.ts

@@ -21,7 +21,7 @@ export declare class QQBot extends EventEmitter {
     sessionManager: SessionManager;
     constructor(config: QQBot.Config);
     removeAt(payload: Dict): void;
-    processPayload(event_id: string, event: string, payload: Dict): GroupMessageEvent | PrivateMessageEvent | GuildMessageEvent | DirectMessageEvent | Dict;
+    processPayload(event_id: string, event: string, payload: Dict): Dict | PrivateMessageEvent | GroupMessageEvent | DirectMessageEvent | GuildMessageEvent;
     getSelfInfo(): Promise<any>;
     getChannelPermissionOfRole(channel_id: string, role_id: string): Promise<any>;
     setChannelAnnounce(guild_id: string, channel_id: string, message_id: string): Promise<any>;

package/lib/adapters/qq/qqBot.js

@@ -88,7 +88,9 @@ class QQBot extends events_1.EventEmitter {
                 raw_message: brief,
                 sender: {
                     user_id: payload.author?.id,
-                    user_openid: payload.author?.user_openid || payload.author?.member_openid
+                    nickname: payload.author?.name || '',
+                    user_openid: payload.author?.user_openid || payload.author?.member_openid,
+                    ...(payload.author || {})
                 },
                 timestamp: new Date(payload.timestamp).getTime() / 1000,
             });
@@ -250,14 +252,16 @@ class QQBot extends events_1.EventEmitter {
             if (!res.data?.length)
                 return [];
             const result = (res.data || []).map(g => {
-                const { joined_at, ...guild } = g;
+                const { id: guild_id, name: guild_name, joined_at, ...guild } = g;
                 return {
+                    guild_id,
+                    guild_name,
                     join_time: new Date(joined_at).getTime() / 1000,
                     ...guild
                 };
             });
             const last = result[result.length - 1];
-            return [...result, ...await _getGuildList(last.id)];
+            return [...result, ...await _getGuildList(last.guild_id)];
         };
         return await _getGuildList();
     }
@@ -272,16 +276,17 @@ class QQBot extends events_1.EventEmitter {
             if (!res.data?.length)
                 return [];
             const result = (res.data || []).map(m => {
-                const { id: member_id, role, join_time, ...member } = m;
+                const { id: member_id, name: member_name, role, join_time, ...member } = m;
                 return {
                     member_id,
+                    member_name,
                     role,
                     join_time: new Date(join_time).getTime() / 1000,
                     ...member
                 };
             });
             const last = result[result.length - 1];
-            return [...result, ...await _getGuildMemberList(last.user?.id)];
+            return [...result, ...await _getGuildMemberList(last.member_id)];
         };
         return await _getGuildMemberList();
     }
@@ -307,7 +312,13 @@ class QQBot extends events_1.EventEmitter {
     }
     async getChannelList(guild_id) {
         const { data: result = [] } = await this.request.get(`/guilds/${guild_id}/channels`);
-        return result;
+        return result.map(({ id: channel_id, name: channel_name, ...channel }) => {
+            return {
+                channel_id,
+                channel_name,
+                ...channel
+            };
+        });
     }
     async sendPrivateMessage(user_id, message, source) {
         const { hasMessages, messages, brief, hasFiles, files } = await message_1.Message.format.call(this, message, source);
@@ -379,7 +390,6 @@ class QQBot extends events_1.EventEmitter {
         let message_id = '';
         if (hasMessages) {
             const { data: result } = await this.request.post(`/v2/groups/${group_id}/messages`, messages);
-            console.log(result);
             message_id = result.seq;
         }
         if (hasFiles) {

package/lib/adapters/qq/sessionManager.js

@@ -167,11 +167,9 @@ class SessionManager extends events_1.EventEmitter {
         this.sendWs(authOp);
     }
     startListen() {
-        this.bot.ws.on("open", () => {
-            this.bot.logger.info("[CLIENT] 连接成功");
-        });
         this.bot.ws.on("close", (code) => {
-            this.bot.logger.error(`[CLIENT] 连接关闭：${code}`);
+            this.alive = false;
+            this.bot.logger.mark(`[CLIENT] 连接关闭：${code}`);
             this.emit(constans_1.SessionEvents.EVENT_WS, {
                 eventType: constans_1.SessionEvents.DISCONNECT,
                 code,
@@ -186,7 +184,8 @@ class SessionManager extends events_1.EventEmitter {
             }
         });
         this.bot.ws.on("error", (e) => {
-            this.bot.logger.error("[CLIENT] 连接错误");
+            this.alive = false;
+            this.bot.logger.mark("[CLIENT] 连接错误");
             this.emit(constans_1.SessionEvents.CLOSED, { eventType: constans_1.SessionEvents.CLOSED });
         });
         this.bot.ws.on("message", (data) => {
@@ -203,7 +202,7 @@ class SessionManager extends events_1.EventEmitter {
             }
             // 鉴权通过
             if (wsRes.t === constans_1.SessionEvents.READY) {
-                this.bot.logger.info(`[CLIENT] 鉴权通过`);
+                this.bot.logger.mark(`[CLIENT] 鉴权通过`);
                 const { d, s } = wsRes;
                 const { session_id, user = {} } = d;
                 this.bot.self_id = user.id;

package/lib/config.sample.yaml

@@ -40,5 +40,17 @@ qq.a: # `${适配器名称}:${账号}`
     - version: V11
   # 。。。其他配置项参见上方对应oneBot版本的通用配置
   protocol: # 将会覆盖通用配置中的protocol
-    platform: 1
+    token: '' # qq机器人token
+    secret: '' # qq机器人secret
+    sandbox: false # 是否沙箱环境
+    intents: # 需要监听的intents
+      - 'GROUP_AT_MESSAGE_CREATE' # 群聊@事件 没有群聊权限请注释
+      - 'C2C_MESSAGE_CREATE' # 私聊事件 没有私聊权限请注释
+      - 'DIRECT_MESSAGE' # 频道私信事件
+      #     - 'GUILD_MESSAGES' # 私域机器人频道消息事件，公域机器人请注释
+      - 'GUILDS' # 频道变更事件
+      - 'GUILD_MEMBERS' # 频道成员变更事件
+      - 'GUILD_MESSAGE_REACTIONS' # 频道消息表态事件
+      - 'INTERACTION' # 互动事件
+      - 'PUBLIC_GUILD_MESSAGES' # 公域机器人频道消息事件，私域机器人请注释
   # 。。。其他配置项参见上方对应oneBot版本的通用配置

package/lib/service/V11/index.js

@@ -314,6 +314,7 @@ class V11 extends service_1.Service {
             return JSON.stringify(data1);
         }
         else {
+            delete data.bot;
             return JSON.stringify(data);
         }
     }

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

@@ -1,28 +1,29 @@
 import { V12 } from "../../../service/V12";
-import { ApiBaseInfo, UpdatePermissionParams } from "../../../adapters/qq/types";
-import { Channel } from "../../../adapters/qq/entries/channel";
-import { Guild } from "../../../adapters/qq/entries/guild";
+import { Dict } from "@zhinjs/shared";
 export declare class GuildAction {
     getGuildSelfInfo(this: V12): Promise<any>;
     getChannelPermissionOfRole(this: V12, channel_id: string, role_id: string): Promise<any>;
     setChannelAnnounce(this: V12, guild_id: string, channel_id: string, message_id: string): Promise<any>;
-    updateChannelPermissionOfRole(this: V12, channel_id: string, role_id: string, permission: UpdatePermissionParams): Promise<any>;
+    updateChannelPermissionOfRole(this: V12, channel_id: string, role_id: string, permission: Dict): Promise<any>;
     getChannelMemberPermission(this: V12, channel_id: string, member_id: string): Promise<any>;
-    updateChannelMemberPermission(this: V12, channel_id: string, member_id: string, permission: UpdatePermissionParams): Promise<any>;
+    updateChannelMemberPermission(this: V12, channel_id: string, member_id: string, permission: Dict): Promise<any>;
     getChannelPins(this: V12, channel_id: string): Promise<string[]>;
     pinChannelMessage(this: V12, channel_id: string, message_id: string): Promise<any>;
     unPinChannelMessage(this: V12, channel_id: string, message_id: string): Promise<any>;
-    createChannel(this: V12, guild_id: string, channelInfo: Omit<Channel.Info, 'id'>): Promise<Channel.Info>;
+    createChannel(this: V12, guild_id: string, channelInfo: Dict): Promise<any>;
     updateChannel(this: V12, { channel_id, ...updateInfo }: {
         channel_id: string;
-    } & Partial<Pick<Channel.Info, 'name' | 'position' | 'parent_id' | 'private_type' | 'speak_permission'>>): Promise<Channel.Info>;
+    } & Dict): Promise<any>;
     deleteChannel(this: V12, channel_id: string): Promise<any>;
     getGuildRoles(this: V12, guild_id: string): Promise<any>;
-    creatGuildRole(this: V12, guild_id: string, role: Pick<Guild.Role, 'name' | 'color' | 'hoist'>): Promise<Guild.Role>;
-    updateGuildRole(this: V12, guild_id: string, { id, ...role }: Pick<Guild.Role, 'id' | 'name' | 'color' | 'hoist'>): Promise<any>;
+    creatGuildRole(this: V12, guild_id: string, role: Dict): Promise<any>;
+    updateGuildRole(this: V12, guild_id: string, { id, ...role }: {
+        [x: string]: any;
+        id: any;
+    }): Promise<any>;
     deleteGuildRole(this: V12, role_id: string): Promise<any>;
     getGuildAccessApis(this: V12, guild_id: string): Promise<any>;
-    applyGuildAccess(this: V12, guild_id: string, channel_id: string, apiInfo: ApiBaseInfo, desc?: string): Promise<any>;
+    applyGuildAccess(this: V12, guild_id: string, channel_id: string, apiInfo: Dict, desc?: string): Promise<any>;
     unMuteGuild(this: V12, guild_id: string): Promise<any>;
     muteGuild(this: V12, guild_id: string, seconds: number, end_time?: number): Promise<any>;
     unMuteGuildMembers(this: V12, guild_id: string, member_ids: string[]): Promise<any>;
@@ -39,10 +40,11 @@ export declare class GuildAction {
     getGuildMemberList(this: V12, guild_id: string): Promise<any>;
     /**
      * 发送频道消息
+     * @param guild_id {string} 频道id
      * @param channel_id {string} 子频道id
      * @param message {import('icqq/lib/service').Sendable} 消息
      */
-    sendGuildMsg(this: V12, channel_id: string, message: V12.Sendable): Promise<any>;
+    sendGuildMsg(this: V12, guild_id: string, channel_id: string, message: V12.Sendable): Promise<any>;
     createDirectSession(this: V12, guild_id: string, user_id: string): Promise<any>;
     sendDirectMsg(this: V12, guild_id: string, message: V12.Sendable): Promise<any>;
 }

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

@@ -100,10 +100,14 @@ class GuildAction {
     }
     /**
      * 发送频道消息
+     * @param guild_id {string} 频道id
      * @param channel_id {string} 子频道id
      * @param message {import('icqq/lib/service').Sendable} 消息
      */
-    async sendGuildMsg(channel_id, message) {
+    async sendGuildMsg(guild_id, channel_id, message) {
+        if (channel_id === 'direct') {
+            return this.adapter.call(this.oneBot.uin, 'V12', 'sendDirectMessage', [guild_id, message]);
+        }
         return this.adapter.call(this.oneBot.uin, 'V12', 'sendGuildMessage', [channel_id, message]);
     }
     async createDirectSession(guild_id, user_id) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "onebots",
-    "version": "0.4.25",
+    "version": "0.4.27",
     "description": "基于icqq的多例oneBot实现",
     "engines": {
         "node": ">=16"
@@ -56,7 +56,8 @@
         "/**/LICENSE"
     ],
     "peerDependencies": {
-        "icqq": "latest"
+        "icqq": "latest",
+        "sqlite3": "^5.1.6"
     },
     "dependencies": {
         "@koa/router": "^10.1.1",
@@ -69,7 +70,6 @@
         "mime-types": "^2.1.35",
         "reflect-metadata": "^0.1.13",
         "seed-random": "^2.2.0",
-        "sqlite3": "^5.1.6",
         "typeorm": "^0.3.17",
         "ws": "^8.8.0"
     }