onebots 0.0.5 → 0.0.7

package/README.md

@@ -1,5 +1,5 @@
 <div align="center">
-    <h1>基于icqq的oneBot实现</h1>
+    <h1>基于oicq的oneBot实现</h1>
     <p>
 
 [![dm](https://shields.io/npm/dm/onebots)](https://www.npmjs.com/package/onebots)
@@ -8,6 +8,9 @@
 [![node engine](https://img.shields.io/node/v/oitq?color=339933&style=flat-square&labelColor=FAFAFA&logo=Node.js)](https://nodejs.org)
 [![qq group](https://img.shields.io/badge/group-860669870-blue?style=flat-square&labelColor=FAFAFA&logo=data:image/png;base64,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&logoColor=000000)](https://jq.qq.com/?_wv=1027&k=B22VGXov)
 
+[![Star History Chart](https://api.star-history.com/svg?repos=lc-cn/onebots&type=Date)](https://star-history.com/#lc-cn/onebots&Date)
+
+
 [Type Docs](https://lc-cn.github.io/onebots) 
 
 
@@ -25,7 +28,7 @@ npm install onebots
 ```
 3. 在项目跟目录添加配置文件config.yaml
 ```yaml
-port: 6727 # 项目icqq-oneBot监听的端口(默认：6727)
+port: 6727 # 项目onebots监听的端口(默认：6727)
 1472258369: # 你的机器人账户
   version: V11 # oneBot版本（V11 或 V12）
 ```
@@ -56,5 +59,5 @@ onebots
 | /remove | get | uin | 移除机器人                 |
 
 # 鸣谢
-1. [icqqjs/icqq](https://github.com/takayama-lily/icqq) 底层服务支持
+1. [takayama-lily/oicq](https://github.com/takayama-lily/oicq) 底层服务支持
 2. [takayama-lily/onebot](https://github.com/takayama-lily/node-onebot) oneBots原先版本

package/lib/onebot.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
+import 'oicq2-cq-enable';
 import { EventEmitter } from 'events';
 import { App } from "./server/app";
-import { Client } from "icqq";
+import { Client } from "oicq";
 import { V11 } from "./service/V11";
 import { V12 } from "./service/V12";
 import { MayBeArray } from "./types";

package/lib/onebot.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BOOLS = exports.OneBotStatus = exports.OneBot = exports.NotFoundError = void 0;
+require("oicq2-cq-enable");
 const events_1 = require("events");
 const app_1 = require("./server/app");
 const utils_1 = require("./utils");
 const path_1 = require("path");
-const icqq_1 = require("icqq");
+const oicq_1 = require("oicq");
 const V11_1 = require("./service/V11");
 const V12_1 = require("./service/V12");
 class NotFoundError extends Error {
@@ -36,7 +37,7 @@ class OneBot extends events_1.EventEmitter {
                     throw new Error('不支持的oneBot版本：' + c.version);
             }
         });
-        this.client = new icqq_1.Client(uin, { platform: this.app.config.platform, data_dir: (0, path_1.join)(app_1.App.configDir, 'data') });
+        this.client = new oicq_1.Client(uin, { platform: this.app.config.platform, data_dir: (0, path_1.join)(app_1.App.configDir, 'data') });
         this.instances = this.config.map(c => {
             switch (c.version) {
                 case 'V11':

package/lib/server/app.d.ts

@@ -8,7 +8,7 @@ import { Router } from "./router";
 import { V11 } from "../service/V11";
 import { V12 } from "../service/V12";
 import { LogLevel, MayBeArray } from "../types";
-import { Platform } from "icqq";
+import { Platform } from "oicq";
 export interface KoaOptions {
     env?: string;
     keys?: string[];

package/lib/server/app.js

@@ -48,7 +48,7 @@ class App extends koa_1.default {
         super(config);
         this.oneBots = [];
         this.config = (0, utils_1.deepMerge)((0, utils_1.deepClone)(App.defaultConfig), config);
-        this.logger = (0, log4js_1.getLogger)('[icqq-oneBot]');
+        this.logger = (0, log4js_1.getLogger)('[oicq-oneBot]');
         this.logger.level = this.config.log_level;
         this.router = new router_1.Router({ prefix: config.path });
         this.use((0, koa_bodyparser_1.default)())
@@ -58,7 +58,7 @@ class App extends koa_1.default {
         this.createOneBots();
     }
     getLogger(uin, version = '') {
-        const logger = (0, log4js_1.getLogger)(`[icqq-oneBot${version}:${uin}]`);
+        const logger = (0, log4js_1.getLogger)(`[oicq-oneBot${version}:${uin}]`);
         logger.level = this.config.log_level;
         return logger;
     }

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

@@ -1,4 +1,4 @@
-import { OnlineStatus } from "icqq";
+import { OnlineStatus } from "oicq";
 import { V11 } from "../../../service/V11";
 export declare class CommonAction {
     /**
@@ -17,12 +17,12 @@ export declare class CommonAction {
      * 获取消息
      * @param message_id {string} 消息id
      */
-    getMsg(this: V11, message_id: string): Promise<import("icqq").GroupMessage | import("icqq").PrivateMessage>;
+    getMsg(this: V11, message_id: string): Promise<import("oicq").GroupMessage | import("oicq").PrivateMessage>;
     /**
      * 获取合并消息
      * @param id {string} 合并id
      */
-    getForwardMsg(this: V11, id: string): Promise<import("icqq").ForwardMessage[]>;
+    getForwardMsg(this: V11, id: string): Promise<import("oicq").ForwardMessage[]>;
     /**
      * 获取 Cookies
      * @param domain {string} 域名
@@ -57,8 +57,9 @@ export declare class CommonAction {
         online: OnlineStatus;
         good: boolean;
     };
-    login(this: V11, password?: string): Promise<unknown>;
+    callLogin(this: V11, func: string, ...args: any[]): Promise<unknown>;
     submitSlider(this: V11, ticket: string): Promise<any>;
+    login(this: V11, password?: string): any;
     submitSmsCode(this: V11, code: string): Promise<any>;
     sendSmsCode(this: V11): void;
 }

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonAction = void 0;
-const icqq_1 = require("icqq");
+const oicq_1 = require("oicq");
 const onebot_1 = require("../../../onebot");
 class CommonAction {
     /**
@@ -62,7 +62,7 @@ class CommonAction {
      */
     getVersion() {
         return {
-            app_name: 'icqq',
+            app_name: 'oicq',
             app_version: '2.x',
             protocol_version: 'v11'
         };
@@ -76,41 +76,40 @@ class CommonAction {
     }
     getStatus() {
         return {
-            online: this.client.status = icqq_1.OnlineStatus.Online,
+            online: this.client.status = oicq_1.OnlineStatus.Online,
             good: this.oneBot.status === onebot_1.OneBotStatus.Good
         };
     }
-    login(password) {
-        const _this = this;
+    callLogin(func, ...args) {
         return new Promise(async (resolve) => {
-            const timer = setTimeout(() => {
-                receiveResult('登录超时');
-            }, 5000);
-            function receiveResult(event) {
-                _this.client.off('system.login.qrcode', receiveResult);
-                _this.client.off('system.login.device', receiveResult);
-                _this.client.off('system.login.slider', receiveResult);
-                _this.client.off('system.login.error', receiveResult);
-                clearTimeout(timer);
+            const receiveResult = (event) => {
+                this.client.off('system.login.qrcode', receiveResult);
+                this.client.off('system.login.device', receiveResult);
+                this.client.off('system.login.slider', receiveResult);
+                this.client.off('system.login.error', receiveResult);
                 resolve(event);
-            }
+            };
             this.client.on('system.login.qrcode', receiveResult);
             this.client.on('system.login.device', receiveResult);
             this.client.on('system.login.slider', receiveResult);
             this.client.on('system.login.error', receiveResult);
-            this.client.on('system.online', receiveResult);
-            await this.client.login(password).catch(() => resolve('登录失败'));
+            this.client.once('system.online', receiveResult);
+            try {
+                await this.client[func](...args);
+            }
+            catch (reason) {
+                receiveResult(reason);
+            }
         });
     }
     async submitSlider(ticket) {
-        await this.client.submitSlider(ticket);
-        // @ts-ignore
-        return this.action.login.apply(this, []);
+        return this.action.callLogin.apply(this, ['submitSlider', ticket]);
+    }
+    login(password) {
+        return this.action.callLogin.apply(this, ['login', password]);
     }
     async submitSmsCode(code) {
-        await this.client.submitSmsCode(code);
-        // @ts-ignore
-        return this.action.login.apply(this, []);
+        return this.action.login.apply(this, ['submitSmsCode', code]);
     }
     sendSmsCode() {
         return this.client.sendSmsCode();

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

@@ -1,16 +1,16 @@
 import { OneBot } from "../../../onebot";
-import { Sendable } from "icqq";
+import { Sendable } from "oicq";
 export declare class FriendAction {
     /**
      * 发送私聊消息
      * @param user_id {number} 用户id
-     * @param message {import('icqq').Sendable} 发送的消息
+     * @param message {import('oicq').Sendable} 发送的消息
      */
-    sendPrivateMsg(this: OneBot<'V11'>, user_id: number, message: Sendable): Promise<import("icqq").MessageRet>;
+    sendPrivateMsg(this: OneBot<'V11'>, user_id: number, message: Sendable): Promise<import("oicq").MessageRet>;
     /**
      * 获取好友列表
      */
-    getFriendList(this: OneBot<'V11'>): Promise<import("icqq").FriendInfo[]>;
+    getFriendList(this: OneBot<'V11'>): Promise<import("oicq").FriendInfo[]>;
     /**
      * 处理好友添加请求
      * @param flag {string} 请求flag
@@ -25,7 +25,7 @@ export declare class FriendAction {
     getStrangerInfo(this: OneBot<'V11'>, user_id: number): Promise<{
         user_id: number;
         nickname: string;
-        sex: import("icqq").Gender;
+        sex: import("oicq").Gender;
         age: number;
         area: string;
     }>;

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

@@ -5,7 +5,7 @@ class FriendAction {
     /**
      * 发送私聊消息
      * @param user_id {number} 用户id
-     * @param message {import('icqq').Sendable} 发送的消息
+     * @param message {import('oicq').Sendable} 发送的消息
      */
     sendPrivateMsg(user_id, message) {
         return this.client.sendPrivateMsg(user_id, message);

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

@@ -1,12 +1,12 @@
-import { Sendable } from "icqq";
+import { Sendable } from "oicq";
 import { V11 } from "../../../service/V11";
 export declare class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
-     * @param message {import('icqq').Sendable} 消息
+     * @param message {import('oicq').Sendable} 消息
      */
-    sendGroupMsg(this: V11, group_id: number, message: Sendable): Promise<import("icqq").MessageRet>;
+    sendGroupMsg(this: V11, group_id: number, message: Sendable): Promise<import("oicq").MessageRet>;
     /**
      * 群组踢人
      * @param group_id {number} 群id
@@ -84,21 +84,21 @@ export declare class GroupAction {
     /**
      * 获取群列表
      */
-    getGroupList(this: V11): Promise<Map<number, import("icqq").GroupInfo>>;
+    getGroupList(this: V11): Promise<Map<number, import("oicq").GroupInfo>>;
     /**
      * 获取指定群信息
      * @param group_id
      */
-    getGroupInfo(this: V11, group_id: number): Promise<import("icqq").GroupInfo>;
+    getGroupInfo(this: V11, group_id: number): Promise<import("oicq").GroupInfo>;
     /**
      * 获取群成员列表
      * @param group_id
      */
-    getGroupMemberList(this: V11, group_id: number): Promise<Map<number, import("icqq").MemberInfo>>;
+    getGroupMemberList(this: V11, group_id: number): Promise<Map<number, import("oicq").MemberInfo>>;
     /**
      * 获取指定群成员信息
      * @param group_id
      * @param user_id
      */
-    getGroupMemberInfo(this: V11, group_id: number, user_id: number): Promise<import("icqq").MemberInfo>;
+    getGroupMemberInfo(this: V11, group_id: number, user_id: number): Promise<import("oicq").MemberInfo>;
 }

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

@@ -5,7 +5,7 @@ class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
-     * @param message {import('icqq').Sendable} 消息
+     * @param message {import('oicq').Sendable} 消息
      */
     sendGroupMsg(group_id, message) {
         return this.client.sendGroupMsg(group_id, message);

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { Client } from "icqq";
+import { Client } from "oicq";
 import { Config } from "./config";
 import { Action } from "./action";
 import { OneBot } from "../../onebot";

package/lib/service/V11/index.js

@@ -8,7 +8,7 @@ const action_1 = require("./action");
 const ws_1 = require("ws");
 const url_1 = require("url");
 const utils_1 = require("../../utils");
-const icqq_cq_enable_1 = require("icqq-cq-enable");
+const oicq2_cq_enable_1 = require("oicq2-cq-enable");
 const onebot_1 = require("../../onebot");
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
@@ -170,7 +170,7 @@ class V11 extends events_1.EventEmitter {
         if (data.post_type === 'system') {
         }
         if (data.message && data.post_type === 'message') {
-            data.message = this.config.post_message_format === 'array' ? (0, icqq_cq_enable_1.toSegment)(data.message) : (0, icqq_cq_enable_1.toCqcode)(data);
+            data.message = this.config.post_message_format === 'array' ? (0, oicq2_cq_enable_1.toSegment)(data.message) : (0, oicq2_cq_enable_1.toCqcode)(data);
         }
         this.emit('dispatch', JSON.stringify(data));
     }
@@ -372,10 +372,10 @@ class V11 extends events_1.EventEmitter {
                         params[k] = (0, utils_1.toBool)(params[k]);
                     if (k === 'message') {
                         if (typeof params[k] === 'string') {
-                            params[k] = (0, icqq_cq_enable_1.fromCqcode)(params[k]);
+                            params[k] = (0, oicq2_cq_enable_1.fromCqcode)(params[k]);
                         }
                         else {
-                            params[k] = (0, icqq_cq_enable_1.fromSegment)(params[k]);
+                            params[k] = (0, oicq2_cq_enable_1.fromSegment)(params[k]);
                         }
                     }
                     args.push(params[k]);

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

@@ -1,6 +1,7 @@
 import { V12 } from '../../../service/V12';
-import { OnlineStatus } from "icqq";
+import { OnlineStatus } from "oicq";
 import { Action } from "./";
+import { V11 } from "../../../service/V11";
 export declare class CommonAction {
     sendMsg(): void;
     /**
@@ -23,9 +24,10 @@ export declare class CommonAction {
         version: string;
         onebot_version: string;
     };
-    submitSlider(this: V12, ticket: string): Promise<unknown>;
-    submitSmsCode(this: V12, code: string): Promise<unknown>;
+    callLogin(this: V11, func: string, ...args: any[]): Promise<unknown>;
+    submitSlider(this: V11, ticket: string): Promise<any>;
+    login(this: V11, password?: string): any;
+    submitSmsCode(this: V11, code: string): Promise<any>;
     sendSmsCode(this: V12): void;
-    login(this: V12, password?: string): Promise<unknown>;
     getSupportedActions(this: V12): string[];
 }

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonAction = void 0;
-const icqq_1 = require("icqq");
+const oicq_1 = require("oicq");
 const onebot_1 = require("../../../onebot");
 const utils_1 = require("../../../utils");
 class CommonAction {
@@ -21,7 +21,7 @@ class CommonAction {
     }
     getStatus() {
         return {
-            online: this.client.status = icqq_1.OnlineStatus.Online,
+            online: this.client.status = oicq_1.OnlineStatus.Online,
             good: this.oneBot.status === onebot_1.OneBotStatus.Good
         };
     }
@@ -35,71 +35,46 @@ class CommonAction {
     }
     getVersion() {
         return {
-            impl: 'icqq_onebot',
+            impl: 'onebots',
             platform: 'qq',
-            version: '0.0.1',
+            version: '0.0.5',
             onebot_version: '12'
         };
     }
+    callLogin(func, ...args) {
+        return new Promise(async (resolve) => {
+            const receiveResult = (event) => {
+                this.client.off('system.login.qrcode', receiveResult);
+                this.client.off('system.login.device', receiveResult);
+                this.client.off('system.login.slider', receiveResult);
+                this.client.off('system.login.error', receiveResult);
+                resolve(event);
+            };
+            this.client.on('system.login.qrcode', receiveResult);
+            this.client.on('system.login.device', receiveResult);
+            this.client.on('system.login.slider', receiveResult);
+            this.client.on('system.login.error', receiveResult);
+            this.client.once('system.online', receiveResult);
+            try {
+                await this.client[func](...args);
+            }
+            catch (reason) {
+                receiveResult(reason);
+            }
+        });
+    }
     async submitSlider(ticket) {
-        await this.client.submitSlider(ticket);
-        // @ts-ignore
-        return this.action.login();
+        return this.action.callLogin.apply(this, ['submitSlider', ticket]);
+    }
+    login(password) {
+        return this.action.callLogin.apply(this, ['login', password]);
     }
     async submitSmsCode(code) {
-        await this.client.submitSmsCode(code);
-        // @ts-ignore
-        return this.action.login();
+        return this.action.login.apply(this, ['submitSmsCode', code]);
     }
     sendSmsCode() {
         return this.client.sendSmsCode();
     }
-    login(password) {
-        const _this = this;
-        return new Promise(async (resolve) => {
-            const timer = setTimeout(() => {
-                resolve('登录超时');
-            }, 5000);
-            function receiveQrcode(event) {
-                _this.client.off('system.login.device', receiveDevice);
-                _this.client.off('system.login.slider', receiveSlider);
-                _this.client.off('system.online', closeListen);
-                clearTimeout(timer);
-                resolve(event);
-            }
-            function receiveDevice(event) {
-                _this.client.off('system.login.qrcode', receiveQrcode);
-                _this.client.off('system.login.slider', receiveSlider);
-                _this.client.off('system.online', closeListen);
-                clearTimeout(timer);
-                resolve(event);
-            }
-            function receiveError(event) {
-                clearTimeout(timer);
-                resolve(event);
-            }
-            function receiveSlider(event) {
-                _this.client.off('system.login.qrcode', receiveQrcode);
-                _this.client.off('system.login.device', receiveDevice);
-                _this.client.off('system.online', closeListen);
-                clearTimeout(timer);
-                resolve(event);
-            }
-            function closeListen() {
-                _this.client.off('system.login.slider', receiveSlider);
-                _this.client.off('system.login.qrcode', receiveQrcode);
-                _this.client.off('system.login.device', receiveDevice);
-                clearTimeout(timer);
-                resolve('登录成功');
-            }
-            this.client.once('system.login.qrcode', receiveQrcode);
-            this.client.once('system.login.device', receiveDevice);
-            this.client.once('system.login.slider', receiveSlider);
-            this.client.once('system.login.error', receiveError);
-            this.client.once('system.online', closeListen);
-            await this.client.login(password).catch(() => resolve('登录失败'));
-        });
-    }
     getSupportedActions() {
         return [...new Set((0, utils_1.getProperties)(this.action))].filter(key => {
             return key !== 'constructor';

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

@@ -1,13 +1,13 @@
 import { V12 } from "../index";
-import { Sendable } from "icqq";
+import { Sendable } from "oicq";
 export declare class FriendAction {
     getUserInfo(this: V12, user_id: number): Promise<{
         user_id: number;
         nickname: string;
-        sex: import("icqq").Gender;
+        sex: import("oicq").Gender;
         age: number;
         area: string;
     }>;
-    getFriendList(this: V12): Map<number, import("icqq").FriendInfo>;
-    sendPrivateMsg(this: V12, user_id: number, message: Sendable): Promise<import("icqq").MessageRet>;
+    getFriendList(this: V12): Map<number, import("oicq").FriendInfo>;
+    sendPrivateMsg(this: V12, user_id: number, message: Sendable): Promise<import("oicq").MessageRet>;
 }

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

@@ -1,12 +1,12 @@
 import { V12 } from "../index";
-import { Sendable } from "icqq";
+import { Sendable } from "oicq";
 export declare class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
-     * @param message {import('icqq').Sendable} 消息
+     * @param message {import('oicq').Sendable} 消息
      */
-    sendGroupMsg(this: V12, group_id: number, message: Sendable): Promise<import("icqq").MessageRet>;
+    sendGroupMsg(this: V12, group_id: number, message: Sendable): Promise<import("oicq").MessageRet>;
     /**
      * 群组踢人
      * @param group_id {number} 群id
@@ -84,21 +84,21 @@ export declare class GroupAction {
     /**
      * 获取群列表
      */
-    getGroupList(this: V12): Promise<Map<number, import("icqq").GroupInfo>>;
+    getGroupList(this: V12): Promise<Map<number, import("oicq").GroupInfo>>;
     /**
      * 获取指定群信息
      * @param group_id
      */
-    getGroupInfo(this: V12, group_id: number): Promise<import("icqq").GroupInfo>;
+    getGroupInfo(this: V12, group_id: number): Promise<import("oicq").GroupInfo>;
     /**
      * 获取群成员列表
      * @param group_id
      */
-    getGroupMemberList(this: V12, group_id: number): Promise<Map<number, import("icqq").MemberInfo>>;
+    getGroupMemberList(this: V12, group_id: number): Promise<Map<number, import("oicq").MemberInfo>>;
     /**
      * 获取指定群成员信息
      * @param group_id
      * @param user_id
      */
-    getGroupMemberInfo(this: V12, group_id: number, user_id: number): Promise<import("icqq").MemberInfo>;
+    getGroupMemberInfo(this: V12, group_id: number, user_id: number): Promise<import("oicq").MemberInfo>;
 }

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

@@ -5,7 +5,7 @@ class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
-     * @param message {import('icqq').Sendable} 消息
+     * @param message {import('oicq').Sendable} 消息
      */
     sendGroupMsg(group_id, message) {
         return this.client.sendGroupMsg(group_id, message);

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { Client } from "icqq";
+import { Client } from "oicq";
 import { Config } from './config';
 import { OneBot } from "../../onebot";
 import { Action } from "./action";
@@ -77,7 +77,7 @@ export declare namespace V12 {
     const defaultConfig: Config;
     type Payload<T extends any> = {
         id: string;
-        impl: 'icqq_onebot';
+        impl: 'oicq_onebot';
         platform: 'qq';
         self_id: `${number}`;
         time: number;

package/lib/service/V12/index.js

@@ -12,7 +12,7 @@ const url_1 = require("url");
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
 const ws_1 = require("ws");
-const icqq_cq_enable_1 = require("icqq-cq-enable");
+const oicq2_cq_enable_1 = require("oicq2-cq-enable");
 const utils_1 = require("../../utils");
 const db_1 = require("../../db");
 const app_1 = require("../../server/app");
@@ -231,7 +231,7 @@ class V12 extends events_1.EventEmitter {
         }
         const payload = {
             id: (0, utils_1.uuid)(),
-            impl: 'icqq_onebot',
+            impl: 'oicq_onebot',
             platform: 'qq',
             self_id: `${this.client.uin}`,
             type: data.post_type || 'meta',
@@ -287,10 +287,10 @@ class V12 extends events_1.EventEmitter {
                         params[k] = (0, utils_1.toBool)(params[k]);
                     if (k === 'message') {
                         if (typeof params[k] === 'string') {
-                            params[k] = (0, icqq_cq_enable_1.fromCqcode)(params[k]);
+                            params[k] = (0, oicq2_cq_enable_1.fromCqcode)(params[k]);
                         }
                         else {
-                            params[k] = (0, icqq_cq_enable_1.fromSegment)(params[k]);
+                            params[k] = (0, oicq2_cq_enable_1.fromSegment)(params[k]);
                         }
                     }
                     args.push(params[k]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "onebots",
-  "version": "0.0.5",
-  "description": "基于icqq的多例oneBot实现",
+  "version": "0.0.7",
+  "description": "基于oicq的多例oneBot实现",
   "main": "lib/index.js",
   "bin": {
     "onebots": "./lib/bin.js"
@@ -19,7 +19,7 @@
   },
   "keywords": [
     "onebot",
-    "icqq",
+    "oicq",
     "cq-http"
   ],
   "author": "凉菜",
@@ -47,12 +47,12 @@
   ],
   "dependencies": {
     "@koa/router": "^10.1.1",
-    "icqq": "^0.0.1",
-    "icqq-cq-enable": "^1.0.0",
     "js-yaml": "^4.1.0",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
     "log4js": "^6.5.2",
+    "oicq": "^2.3.1",
+    "oicq2-cq-enable": "^1.0.6",
     "ws": "^8.8.0"
   }
 }