onebots 0.4.43 → 0.4.45

package/lib/adapters/icqq/index.js

@@ -47,43 +47,59 @@ const onebot_1 = require("../../onebot");
 const utils_1 = require("../../utils");
 const path = __importStar(require("path"));
 const shareMusicCustom_1 = require("../../service/shareMusicCustom");
-async function processMessages(target_id, target_type, list) {
+const message_1 = require("icqq/lib/message");
+async function processMessages(uin, target_id, target_type, list) {
     let result = [];
     for (const item of list) {
         const { type, data, ...other } = item;
-        if (type === 'node') {
-            result.push({
-                type,
-                ...data,
-                message: await processMessages.call(this, data.user_id, 'private', data.message || [])
-            });
-        }
-        if (type === 'music') {
-            if (String(item.data.platform) === 'custom') {
-                item.data.platform = item.data['subtype']; // gocq 的平台数据存储在 subtype 内，兼容 icqq 时要求前端必须发送 id 字段
+        switch (type) {
+            case 'node': {
+                result.push({
+                    type,
+                    ...data,
+                    message: await processMessages.call(this, uin, data.user_id, 'private', data.content || [])
+                });
+                break;
+            }
+            case 'music': {
+                if (String(item.data.platform) === 'custom') {
+                    item.data.platform = item.data['subtype']; // gocq 的平台数据存储在 subtype 内，兼容 icqq 时要求前端必须发送 id 字段
+                }
+                const { type, data } = item;
+                await shareMusicCustom_1.shareMusic.call(this[target_type === 'private' ? 'pickFriend' : 'pickGroup'](target_id), {
+                    type,
+                    ...data
+                });
+                break;
+            }
+            case 'share': {
+                await this[target_type === 'private' ? 'pickFriend' : 'pickGroup'](target_id).shareUrl(item.data);
+                break;
+            }
+            case 'video':
+            case 'audio':
+            case 'image': {
+                if (item['file_id']?.startsWith('base64://'))
+                    item['file_id'] = Buffer.from(item['file_id'].slice(9), 'base64');
+                if (item['file']?.startsWith('base64://'))
+                    item['file'] = Buffer.from(item['file'].slice(9), 'base64');
+                result.push({
+                    type,
+                    ...data,
+                    ...other
+                });
+                break;
+            }
+            case 'reply': {
+                const oneBot = this.getOneBot(uin);
+                const message_id = oneBot.V11.getStrByInt('message_id', data.id);
+                const msg = await oneBot.internal.getMsg(message_id);
+                result.push({
+                    type: 'quote',
+                    ...msg
+                });
             }
-            const { type, data } = item;
-            await shareMusicCustom_1.shareMusic.call(this[target_type === 'private' ? 'pickFriend' : 'pickGroup'](target_id), {
-                type,
-                ...data
-            });
-            continue;
-        }
-        if (type === 'share') {
-            await this[target_type === 'private' ? 'pickFriend' : 'pickGroup'](target_id).shareUrl(item.data);
-            continue;
-        }
-        if (['image', 'video', 'audio'].includes(item.type)) {
-            if (item['file_id']?.startsWith('base64://'))
-                item['file_id'] = Buffer.from(item['file_id'].slice(9), 'base64');
-            if (item['file']?.startsWith('base64://'))
-                item['file'] = Buffer.from(item['file'].slice(9), 'base64');
         }
-        result.push({
-            type,
-            ...data,
-            ...other
-        });
     }
     return result;
 }
@@ -120,27 +136,65 @@ class IcqqAdapter extends adapter_1.Adapter {
         })));
         return oneBot;
     }
-    formatEventPayload(version, event, data) {
-        return {
+    formatEventPayload(uin, version, event, data) {
+        const oneBot = this.getOneBot(uin);
+        const result = {
             id: data.id,
             type: event,
             version: version,
             self: {
-                platform: 'icqq',
+                platform: 'qq',
                 user_id: data.self_id
             },
             detail_type: data.message_type || data.notice_type || data.request_type,
-            platform: 'icqq',
+            platform: 'qq',
             ...data,
         };
+        if (data.source) {
+            const message_id = data.message_type === 'group' ? (0, message_1.genGroupMessageId)(data.group_id, data.sender.user_id, data.source?.seq, data.source?.rand, data.source?.time, data.source?.pktnum) :
+                (0, message_1.genDmMessageId)(data.sender.user_id, data.source?.seq, data.source?.rand, data.source?.time);
+            data.message[0] = {
+                type: 'reply',
+                id: version === 'V11' ? oneBot.V11.transformToInt('message_id', message_id) : message_id,
+            };
+        }
+        return result;
     }
     async sendPrivateMessage(uin, version, args) {
-        const [user_id, message] = args;
-        return this.oneBots.get(uin)?.internal.sendPrivateMsg(user_id, await processMessages.call(this, user_id, 'private', message));
+        const [user_id, message, source] = args;
+        const client = this.oneBots.get(uin)?.internal;
+        let quote;
+        if (source)
+            quote = await client.getMsg(source);
+        const result = await client.sendPrivateMsg(parseInt(user_id), await processMessages.call(this, uin, user_id, 'private', message), quote);
+        return {
+            message_id: version === 'V11' ? this.oneBots.get(uin).V11.transformToInt('message_id', result.message_id) : result.message_id
+        };
+    }
+    deleteMessage(uin, version, args) {
+        const bot = this.getOneBot(uin).internal;
+        return bot.deleteMsg(args[0]);
     }
     async sendGroupMessage(uin, version, args) {
-        const [group_id, message] = args;
-        return this.oneBots.get(uin)?.internal.sendGroupMsg(group_id, await processMessages.call(this, group_id, 'group', message));
+        const [group_id, message, source] = args;
+        const client = this.oneBots.get(uin)?.internal;
+        let quote;
+        if (source)
+            quote = await client.getMsg(source);
+        const result = await client.sendGroupMsg(parseInt(group_id), await processMessages.call(this, group_id, 'group', message), quote);
+        return {
+            message_id: version === 'V11' ? this.oneBots.get(uin).V11.transformToInt('message_id', result.message_id) : result.message_id
+        };
+    }
+    async sendGuildMessage(uin, version, args) {
+        const [target_id, message, source] = args;
+        const client = this.oneBots.get(uin)?.internal;
+        const [guild_id, channel_id] = target_id.split(':');
+        const result = await client.sendGuildMsg(guild_id, channel_id, await processMessages.call(this, target_id, 'channel', message));
+        const message_id = `${result.seq}:${result.rand}:${result.time}`;
+        return {
+            message_id: version === 'V11' ? this.oneBots.get(uin).V11.transformToInt('message_id', message_id) : message_id
+        };
     }
     call(uin, version, method, args = []) {
         try {

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

@@ -9,12 +9,17 @@ export default class QQAdapter extends Adapter<'qq'> {
     setOnline(uin: string): Promise<void>;
     setOffline(uin: string): Promise<void>;
     createOneBot(uin: string, protocol: Bot.Config, versions: OneBot.Config[]): OneBot;
+    sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
+    sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
+    sendGuildMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
+    sendDirectMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
+    deleteMessage(uin: string, message_id: string): Promise<boolean>;
     call(uin: string, version: string, method: string, args?: any[]): Promise<any>;
     fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V> | OneBot.Segment<V>[]): OneBot.MessageElement<V>[];
     toSegment<V extends OneBot.Version, M = Sendable>(version: V, message: M): OneBot.Segment<V>[];
     fromCqcode<V extends OneBot.Version>(version: V, message: string): OneBot.MessageElement<V>[];
     toCqcode<V extends OneBot.Version>(version: V, messageArr: OneBot.MessageElement<V>[]): string;
-    formatEventPayload<V extends OneBot.Version>(version: V, event: string, data: any): OneBot.Payload<V>;
+    formatEventPayload<V extends OneBot.Version>(uin: string, version: V, event: string, data: any): OneBot.Payload<V>;
     start(uin: string): Promise<void>;
     stop(uin?: string): Promise<void>;
     getSelfInfo<V extends OneBot.Version>(uin: string, version: V): OneBot.SelfInfo<V>;

package/lib/adapters/qq/index.js

@@ -82,6 +82,75 @@ class QQAdapter extends adapter_1.Adapter {
         oneBot.status = onebot_1.OneBotStatus.Online;
         return oneBot;
     }
+    async sendGroupMessage(uin, version, args) {
+        const [group_id, message, source] = args;
+        const bot = this.getOneBot(uin);
+        let quote;
+        if (source)
+            quote = { id: source };
+        const result = await bot.internal.sendGroupMessage(group_id, message.map(({ type, data }) => ({ type, ...data })), quote);
+        if (result.msg === 'success') {
+            return {
+                message_id: version === 'V11' ? bot.V11.transformToInt('message_id', `group:${group_id}${result.msg_id}`) : `group:${group_id}${result.msg_id}`,
+            };
+        }
+        throw new Error(result.msg);
+    }
+    async sendPrivateMessage(uin, version, args) {
+        const [user_id, message, source] = args;
+        const bot = this.getOneBot(uin);
+        let quote;
+        if (source)
+            quote = { id: source };
+        const result = await bot.internal.sendPrivateMessage(user_id, message.map(({ type, data }) => ({ type, ...data })), quote);
+        if (result.msg === 'success') {
+            return {
+                message_id: version === 'V11' ? bot.V11.transformToInt('message_id', `private:${user_id}${result.msg_id}`) : `private:${user_id}${result.msg_id}`,
+            };
+        }
+        throw new Error(result.msg);
+    }
+    async sendGuildMessage(uin, version, args) {
+        const [channel_id, message, source] = args;
+        const bot = this.getOneBot(uin);
+        let quote;
+        if (source)
+            quote = { id: source };
+        const result = await bot.internal.sendGuildMessage(channel_id, message.map(({ type, data }) => ({ type, ...data })), quote);
+        if (result.msg === 'success') {
+            return {
+                message_id: version === 'V11' ? bot.V11.transformToInt('message_id', `guild:${channel_id}${result.msg_id}`) : `guild:${channel_id}${result.msg_id}`,
+            };
+        }
+        throw new Error(result.msg);
+    }
+    async sendDirectMessage(uin, version, args) {
+        const [guild_id, message, source] = args;
+        const bot = this.getOneBot(uin);
+        let quote;
+        if (source)
+            quote = { id: source };
+        const result = await bot.internal.sendDirectMessage(guild_id, message.map(({ type, data }) => ({ type, ...data })), quote);
+        if (result.msg === 'success') {
+            return {
+                message_id: version === 'V11' ? bot.V11.transformToInt('message_id', `direct:${guild_id}${result.msg_id}`) : `direct:${guild_id}${result.msg_id}`,
+            };
+        }
+        throw new Error(result.msg);
+    }
+    deleteMessage(uin, message_id) {
+        const [from_type, from_id, ...msg_idArr] = message_id.split(':');
+        const bot = this.getOneBot(uin).internal;
+        switch (from_type) {
+            case 'private':
+            case 'group':
+                throw new Error(`暂不支持撤回${from_type}类型的消息`);
+            case 'direct':
+                return bot.recallDirectMessage(from_id, msg_idArr.join(':'));
+            case 'guild':
+                return bot.recallGuildMessage(from_id, msg_idArr.join(':'));
+        }
+    }
     call(uin, version, method, args) {
         const oneBot = this.oneBots.get(uin);
         if (!oneBot) {
@@ -171,7 +240,7 @@ class QQAdapter extends adapter_1.Adapter {
             return `[CQ:${item.type},${dataStr.join(',')}]`;
         }).join('');
     }
-    formatEventPayload(version, event, data) {
+    formatEventPayload(uin, version, event, data) {
         const result = {
             id: data.id,
             [version === 'V12' ? 'type' : 'post_type']: event,
@@ -185,7 +254,18 @@ class QQAdapter extends adapter_1.Adapter {
             time: data.timestamp,
             ...data,
         };
+        if (data.message_id) {
+            data.message_id = `${data.message_type}:${data.channel_id || data.guild_id || data.group_id || data.user_id}:${data.message_id}`;
+        }
         delete result.bot;
+        const oneBot = this.getOneBot(uin);
+        switch (version) {
+            case "V11":
+                oneBot.V11.transformStrToIntForObj(result, ['message_id', 'user_id', 'group_id']);
+                oneBot.V11.transformStrToIntForObj(result.sender, ['user_id ']);
+                oneBot.V11.transformStrToIntForObj(result.self, ['user_id ']);
+                break;
+        }
         return result;
     }
     async start(uin) {

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

@@ -11,13 +11,16 @@ export default class WechatAdapter extends Adapter<'wechat'> {
     setOffline(uin: string): Promise<void>;
     createOneBot(uin: string, protocol: WechatConfig, versions: OneBot.Config[]): OneBot;
     call(uin: string, version: string, method: string, args?: any[]): Promise<any>;
-    sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[]]): Promise<OneBot.MessageRet<V>>;
-    sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[]]): Promise<OneBot.MessageRet<V>>;
+    sendPrivateMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
+    sendGroupMessage<V extends OneBot.Version>(uin: string, version: V, args: [string, OneBot.MessageElement<V>[], string]): Promise<OneBot.MessageRet<V>>;
+    deleteMessage<V extends OneBot.Version>(uin: string, version: V, [str]: [string]): Promise<boolean>;
     fromSegment<V extends OneBot.Version>(version: V, segment: OneBot.Segment<V> | OneBot.Segment<V>[]): OneBot.MessageElement<V>[];
     toSegment<V extends OneBot.Version, M = Sendable>(version: V, message: M): OneBot.Segment<V>[];
     fromCqcode<V extends OneBot.Version>(version: V, message: string): OneBot.MessageElement<V>[];
     toCqcode<V extends OneBot.Version>(version: V, messageArr: OneBot.MessageElement<V>[]): string;
-    formatEventPayload<V extends OneBot.Version>(version: V, event: string, data: any): OneBot.Payload<V>;
+    getFriendList<V extends OneBot.Version>(uin: string, version: V): Promise<OneBot.UserInfo<V>[]>;
+    getGroupList<V extends OneBot.Version>(uin: string, version: V): Promise<OneBot.GroupInfo<V>[]>;
+    formatEventPayload<V extends OneBot.Version>(uin: string, version: V, event: string, data: any): OneBot.Payload<V>;
     start(uin: string): Promise<void>;
     stop(uin?: string): Promise<void>;
     getSelfInfo<V extends OneBot.Version>(uin: string, version: V): OneBot.SelfInfo<V>;

package/lib/adapters/wechat/index.js

@@ -99,23 +99,57 @@ class WechatAdapter extends adapter_1.Adapter {
     }
     async sendPrivateMessage(uin, version, args) {
         const [user_id, message] = args;
-        return this.oneBots.get(uin)?.internal.sendPrivateMsg(user_id, message.map(item => {
+        const bot = this.getOneBot(uin);
+        let result = await bot.internal.sendPrivateMsg(user_id, message.map(item => {
             const { type, data } = item;
             return {
                 type,
                 ...data
             };
         }));
+        if (Array.isArray(result))
+            result = JSON.stringify(result);
+        return {
+            message_id: version === 'V11' ? bot.V11.transformToInt('message_id', `${user_id}:${result}`) : `${user_id}:${result}`
+        };
     }
     async sendGroupMessage(uin, version, args) {
         const [group_id, message] = args;
-        return this.oneBots.get(uin)?.internal.sendGroupMsg(group_id, message.map(item => {
+        const bot = this.getOneBot(uin);
+        let result = await bot.internal.sendGroupMsg(group_id, message.map(item => {
             const { type, data } = item;
             return {
                 type,
                 ...data
             };
         }));
+        if (Array.isArray(result))
+            result = JSON.stringify(result);
+        return {
+            message_id: version === 'V11' ? bot.V11.transformToInt('message_id', `${group_id}:${result}`) : `${group_id}:${result}`
+        };
+    }
+    async deleteMessage(uin, version, [str]) {
+        const [username, ...message_idArr] = str.split(':');
+        const bot = this.getOneBot(uin);
+        try {
+            const message_ids = JSON.parse(message_idArr.join(':'));
+            if (Array.isArray(message_ids)) {
+                let success = false;
+                for (const message_id in message_ids) {
+                    success = await bot.internal.recallMsg(username, message_id);
+                    if (!success)
+                        return success;
+                }
+                return success;
+            }
+            else if (message_ids && typeof message_ids === 'string') {
+                return await bot.internal.recallMsg(username, message_ids);
+            }
+        }
+        catch {
+            return bot.internal.recallMsg(username, message_idArr.join(':'));
+        }
     }
     fromSegment(version, segment) {
         return [].concat(segment).map(item => {
@@ -190,7 +224,29 @@ class WechatAdapter extends adapter_1.Adapter {
             return `[CQ:${item.type},${dataStr.join(',')}]`;
         }).join('');
     }
-    formatEventPayload(version, event, data) {
+    async getFriendList(uin, version) {
+        const bot = this.getOneBot(uin);
+        const result = bot.internal.getFriendList();
+        return result.map(friend => {
+            return {
+                ...friend,
+                user_name: friend.nickname,
+                user_id: version === "V11" ? bot.V11.transformToInt('friend', friend.user_id) : friend.user_id,
+            };
+        });
+    }
+    async getGroupList(uin, version) {
+        const bot = this.getOneBot(uin);
+        const result = bot.internal.getGroupList();
+        return result.map(group => {
+            return {
+                ...group,
+                group_id: version === "V11" ? bot.V11.transformToInt('group', group.group_id) : group.group_id,
+            };
+        });
+    }
+    formatEventPayload(uin, version, event, data) {
+        const bot = this.getOneBot(uin);
         const result = {
             id: data.id,
             [version === 'V12' ? 'type' : 'post_type']: event,
@@ -210,6 +266,14 @@ class WechatAdapter extends adapter_1.Adapter {
         delete result.bot;
         delete result.c;
         delete result.parser;
+        if (version === 'V11') {
+            bot.V11.transformStrToIntForObj(result, ['user_id', 'group_id', 'message_id']);
+            bot.V11.transformStrToIntForObj(result.self, ['user_id']);
+            bot.V11.transformStrToIntForObj(result.sender, ['user_id']);
+            bot.V11.transformStrToIntForObj(result.group, ['user_id', 'group_id']);
+            bot.V11.transformStrToIntForObj(result.member, ['user_id', 'member_id']);
+            bot.V11.transformStrToIntForObj(result.friend, ['user_id']);
+        }
         return result;
     }
     async start(uin) {

package/lib/db.js

@@ -76,7 +76,7 @@ class JsonDB {
         return initialValue;
     }
     set(route, data) {
-        const parentPath = route.split('.');
+        const parentPath = route.split('.').filter(c => c.length);
         const key = parentPath.pop();
         if (!key)
             throw new SyntaxError(`route can't empty`);

package/lib/onebot.d.ts

@@ -21,6 +21,8 @@ export declare class OneBot<T = any> extends EventEmitter {
     internal: T;
     instances: (V11 | V12)[];
     get app(): import(".").App;
+    get V11(): V11;
+    get V12(): V12;
     get platform(): string;
     get logger(): Logger;
     get info(): {

package/lib/onebot.js

@@ -28,6 +28,12 @@ class OneBot extends events_1.EventEmitter {
     get app() {
         return this.adapter.app;
     }
+    get V11() {
+        return this.instances.find(i => i.version === 'V11');
+    }
+    get V12() {
+        return this.instances.find(i => i.version === 'V12');
+    }
     get platform() {
         return this.adapter.platform;
     }
@@ -95,7 +101,7 @@ class OneBot extends events_1.EventEmitter {
     }
     async dispatch(event, data) {
         for (const instance of this.instances) {
-            instance.dispatch(instance.format(event, this.adapter.formatEventPayload(instance.version, event, data)));
+            instance.dispatch(instance.format(event, this.adapter.formatEventPayload(this.uin, instance.version, event, data)));
         }
     }
 }

package/lib/server/app.d.ts

@@ -29,11 +29,12 @@ export declare class App extends Koa {
     httpServer: Server;
     logger: Logger;
     static configDir: string;
-    static configPath: string;
+    static get configPath(): string;
+    static get dataDir(): string;
+    static get logFile(): string;
     adapters: Map<string, Adapter>;
     ws: WsServer;
     router: Router;
-    static logFile: string;
     get info(): {
         system_platform: NodeJS.Platform;
         system_arch: NodeJS.Architecture;

package/lib/server/app.js

@@ -46,6 +46,15 @@ const path = __importStar(require("path"));
 const process_1 = __importDefault(require("process"));
 const fs = __importStar(require("fs"));
 class App extends koa_1.default {
+    static get configPath() {
+        return path.join(App.configDir, 'config.yaml');
+    }
+    static get dataDir() {
+        return path.join(App.configDir, 'data');
+    }
+    static get logFile() {
+        return path.join(App.configDir, 'onebots.log');
+    }
     get info() {
         const pkg = require(path.resolve(__dirname, '../../package.json'));
         const free_memory = os.freemem();
@@ -166,10 +175,10 @@ class App extends koa_1.default {
         this.httpServer.listen(this.config.port);
         const fileListener = (e) => {
             if (e === 'change')
-                this.ws.clients.forEach(client => {
+                this.ws.clients.forEach(async (client) => {
                     client.send(JSON.stringify({
                         event: 'system.log',
-                        data: (0, utils_1.readLine)(1, App.logFile)
+                        data: await (0, utils_1.readLine)(1, App.logFile)
                     }));
                 });
         };
@@ -292,17 +301,17 @@ class App extends koa_1.default {
 }
 exports.App = App;
 App.configDir = path.join(os.homedir(), '.onebots');
-App.configPath = path.join(App.configDir, 'config.yaml');
-App.logFile = path.join(process_1.default.cwd(), 'onebots.log');
 function createOnebots(config = 'config.yaml', cp) {
     if (typeof config === 'string') {
         config = path.resolve(process_1.default.cwd(), config);
         App.configDir = path.dirname(config);
-        App.configPath = config;
         if (!(0, fs_1.existsSync)(App.configDir)) {
             (0, fs_1.mkdirSync)(App.configDir);
         }
-        App.configPath = path.resolve(App.configDir, config);
+        if (!(0, fs_1.existsSync)(App.dataDir)) {
+            (0, fs_1.mkdirSync)(App.dataDir);
+            console.log('以为你创建数据存储目录', App.dataDir);
+        }
         if (!(0, fs_1.existsSync)(App.configPath)) {
             (0, fs_1.copyFileSync)(path.resolve(__dirname, '../config.sample.yaml'), App.configPath);
             console.log('未找到对应配置文件，已自动生成默认配置文件，请修改配置文件后重新启动');

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

@@ -19,12 +19,8 @@ class CommonAction {
     async deleteMsg(message_id) {
         if (message_id == 0)
             throw new Error('getMsg: message_id[0] is invalid');
-        let msg_entry = this.db.find('messages', (message) => {
-            return message.id === message_id;
-        });
-        if (!msg_entry)
-            throw new Error(`getMsg: can not find msg[${message_id}] in db`);
-        return this.adapter.call(this.oneBot.uin, 'V11', 'deleteMsg', [msg_entry.base64_id]);
+        const msg_id = this.getStrByInt('message_id', message_id);
+        return this.adapter.call(this.oneBot.uin, 'V11', 'deleteMessage', [this.oneBot.uin, msg_id]);
     }
     /**
      * 获取消息

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

@@ -3,10 +3,10 @@ export declare class FriendAction {
     /**
      * 发送私聊消息
      * @param user_id {number} 用户id
-     * @param message {MessageElem[]} 发送的消息
-     * @param message_id {string} 引用的消息ID
+     * @param message {V11.Sendable} 发送的消息
+     * @param message_id {number} 引用的消息ID
      */
-    sendPrivateMsg(this: V11, user_id: number, message: V11.Sendable, message_id?: string): Promise<any>;
+    sendPrivateMsg(this: V11, user_id: number, message: V11.Sendable, message_id?: number): Promise<V11.MessageRet>;
     /**
      * 获取好友列表
      */

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

@@ -5,11 +5,13 @@ class FriendAction {
     /**
      * 发送私聊消息
      * @param user_id {number} 用户id
-     * @param message {MessageElem[]} 发送的消息
-     * @param message_id {string} 引用的消息ID
+     * @param message {V11.Sendable} 发送的消息
+     * @param message_id {number} 引用的消息ID
      */
     async sendPrivateMsg(user_id, message, message_id) {
-        return this.adapter.call(this.oneBot.uin, 'V11', 'sendPrivateMessage', [user_id, message, message_id]);
+        const msg_id = message_id ? this.getStrByInt('message_id', message_id) : undefined;
+        const uid = this.getStrByInt('user_id', user_id);
+        return this.adapter.call(this.oneBot.uin, 'V11', 'sendPrivateMessage', [uid, message, msg_id]);
     }
     /**
      * 获取好友列表

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

@@ -3,10 +3,10 @@ export declare class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
-     * @param message {MessageElem[]} 消息
-     * @param message_id {string} 引用的消息ID
+     * @param message {V11.Sendable[]} 消息
+     * @param message_id {number} 引用的消息ID
      */
-    sendGroupMsg(this: V11, group_id: number, message: V11.Sendable, message_id?: string): Promise<any>;
+    sendGroupMsg(this: V11, group_id: number, message: V11.Sendable, message_id?: number): Promise<V11.MessageRet>;
     /**
      * 群组踢人
      * @param group_id {number} 群id

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

@@ -5,11 +5,13 @@ class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
-     * @param message {MessageElem[]} 消息
-     * @param message_id {string} 引用的消息ID
+     * @param message {V11.Sendable[]} 消息
+     * @param message_id {number} 引用的消息ID
      */
     async sendGroupMsg(group_id, message, message_id) {
-        return this.adapter.call(this.oneBot.uin, 'V11', 'sendGroupMessage', [group_id, message, message_id]);
+        const msg_id = message_id ? this.getStrByInt('message_id', message_id) : undefined;
+        const gid = this.getStrByInt('group_id', group_id);
+        return this.adapter.call(this.oneBot.uin, 'V11', 'sendGroupMessage', [gid, message, msg_id]);
     }
     /**
      * 群组踢人

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

@@ -26,6 +26,9 @@ export declare class V11 extends Service<"V11"> implements OneBot.Base {
     wss?: WebSocketServer;
     wsr: Set<WebSocket>;
     constructor(oneBot: OneBot, config: OneBot.Config<"V11">);
+    transformToInt(path: string, value: string): number;
+    transformStrToIntForObj<T extends object>(obj: T, keys: (keyof T)[]): void;
+    getStrByInt(path: string, value: number): string;
     start(): void;
     private startHttp;
     private startHttpReverse;
@@ -35,16 +38,6 @@ export declare class V11 extends Service<"V11"> implements OneBot.Base {
     format(_: any, data: any): any;
     dispatch(data: any): Promise<void>;
     private _formatEvent;
-    private addMsgToDB;
-    /**
-     * 从 send_msg_xxx() 调用的返回值中提取消息存入数据库(可以让前端在没有收到同步的message数据前就有能力拿到消息对应的base64_id)
-     * (也有可能来的比message慢，后来的话会被数据库忽略)
-     * @param user_id 发送者
-     * @param group_id 群号，私聊为0
-     * @param seq 消息序号
-     * @param base64_id icqq返回的base64格式的消息id
-     */
-    private addMsgToDBFromSendMsgResult;
     private getReplyMsgIdFromDB;
     private _httpRequestHandler;
     /**