onebots 0.4.59 → 0.4.61

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

@@ -6,14 +6,14 @@ export declare class GroupAction {
      * @param message {V12.Sendable} 消息
      * @param source {source} 引用消息id
      */
-    sendGroupMsg(this: V12, group_id: number, message: V12.Sendable, source?: string): Promise<V12.MessageRet>;
+    sendGroupMsg(this: V12, group_id: string, message: V12.Sendable, source?: string): Promise<V12.MessageRet>;
     /**
      * 群组踢人
      * @param group_id {number} 群id
      * @param user_id {number} 成员id
      * @param reject_add_request {boolean} 是否禁止此人加群请求
      */
-    setGroupKick(this: V12, group_id: number, user_id: number, reject_add_request?: boolean): Promise<any>;
+    setGroupKick(this: V12, group_id: string, user_id: string, reject_add_request?: boolean): Promise<any>;
     /**
      * 设置群精华
      * @param message_id
@@ -23,63 +23,64 @@ export declare class GroupAction {
      * 移除群精华
      * @param message_id
      */
-    deleteEssenceMessage(this: V12, message_id: string): Promise<any>;
+    removeEssenceMessage(this: V12, message_id: string): Promise<any>;
     /**
      * 群打卡
      * @param group_id 群id
      */
-    sendGroupSign(this: V12, group_id: number): Promise<any>;
+    sendGroupSign(this: V12, group_id: string): Promise<any>;
     /**
      * 群禁言指定人
      * @param group_id {number} 群id
      * @param user_id {number} 成员id
      * @param duration {number} 禁言时长(单位：秒)
      */
-    setGroupBan(this: V12, group_id: number, user_id: number, duration?: number): Promise<any>;
+    setGroupBan(this: V12, group_id: string, user_id: string, duration?: number): Promise<any>;
     /**
      * 群禁言匿名者
      * @param group_id {number} 群id
      * @param flag {string} 匿名者flag
      * @param duration {number} 禁言时长(单位：秒)
      */
-    setGroupAnonymousBan(this: V12, group_id: number, flag: string, duration?: number): Promise<any>;
+    setGroupAnonymousBan(this: V12, group_id: string, flag: string, duration?: number): Promise<any>;
     /**
      * 群全体禁言
      * @param group_id {number} 群id
      * @param enable {boolean} 是否禁言
      */
-    setGroupWholeBan(this: V12, group_id: number, enable?: boolean): Promise<any>;
+    setGroupWholeBan(this: V12, group_id: string, enable?: boolean): Promise<any>;
     /**
      * 群匿名聊天
      * @param group_id {number} 群id
      * @param enable {boolean} 是否开启
      */
-    setGroupAnonymous(this: V12, group_id: number, enable?: boolean): Promise<any>;
+    setGroupAnonymous(this: V12, group_id: string, enable?: boolean): Promise<any>;
     /**
      * 设置群管
      * @param group_id {number} 群id
      * @param user_id {number} 成员id
      * @param enable {boolean} true 设为管理，false 取消管理
      */
-    setGroupAdmin(this: V12, group_id: number, user_id: number, enable?: boolean): Promise<any>;
+    setGroupAdmin(this: V12, group_id: string, user_id: string, enable?: boolean): Promise<any>;
     /**
      * 设置群成员名片(成员备注)
      * @param group_id {number} 群id
      * @param user_id {number} 成员id
      * @param card {string} 名片信息，不传或传空串则为 删除名片
      */
-    setGroupCard(this: V12, group_id: number, user_id: number, card?: string): Promise<any>;
+    setGroupCard(this: V12, group_id: string, user_id: string, card?: string): Promise<any>;
     /**
      * 设置群名
      * @param group_id {number} 群id
      * @param name {string} 新群名
      */
-    setGroupName(this: V12, group_id: number, name: string): Promise<any>;
+    setGroupName(this: V12, group_id: string, name: string): Promise<any>;
+    sendGroupPoke(this: V12, group_id: string, user_id: string): Promise<any>;
     /**
      * 退出指定群聊
      * @param group_id {number} 群id
      */
-    leaveGroup(this: V12, group_id: number): Promise<any>;
+    leaveGroup(this: V12, group_id: string): Promise<any>;
     /**
      * 设置群成员头衔
      * @param group_id {number} 群id
@@ -87,7 +88,7 @@ export declare class GroupAction {
      * @param special_title {string} 头衔
      * @param duration {number} 持有时长 不传则永久
      */
-    setGroupSpecialTitle(this: V12, group_id: number, user_id: number, special_title: string, duration?: number): Promise<any>;
+    setGroupSpecialTitle(this: V12, group_id: string, user_id: string, special_title: string, duration?: number): Promise<any>;
     /**
      * 处理加群请求
      * @param flag {string} 加群flag
@@ -104,16 +105,22 @@ export declare class GroupAction {
      * 获取指定群信息
      * @param group_id
      */
-    getGroupInfo(this: V12, group_id: number): Promise<any>;
+    getGroupInfo(this: V12, group_id: string): Promise<any>;
     /**
      * 获取群成员列表
      * @param group_id
      */
-    getGroupMemberList(this: V12, group_id: number): Promise<any>;
+    getGroupMemberList(this: V12, group_id: string): Promise<any>;
     /**
      * 获取指定群成员信息
      * @param group_id
      * @param user_id
      */
-    getGroupMemberInfo(this: V12, group_id: number, user_id: number): Promise<any>;
+    getGroupMemberInfo(this: V12, group_id: string, user_id: string): Promise<any>;
+    /**
+     * 设置群公告
+     * @param group_id
+     * @param content
+     */
+    sendGroupNotice(this: V12, group_id: string, content: string): Promise<any>;
 }

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

@@ -39,8 +39,8 @@ class GroupAction {
      * 移除群精华
      * @param message_id
      */
-    deleteEssenceMessage(message_id) {
-        return this.adapter.call(this.oneBot.uin, "V12", "deleteEssenceMessage", [message_id]);
+    removeEssenceMessage(message_id) {
+        return this.adapter.call(this.oneBot.uin, "V12", "removeEssenceMessage", [message_id]);
     }
     /**
      * 群打卡
@@ -121,6 +121,9 @@ class GroupAction {
     setGroupName(group_id, name) {
         return this.adapter.call(this.oneBot.uin, "V12", "setGroupName", [group_id, name]);
     }
+    sendGroupPoke(group_id, user_id) {
+        return this.adapter.call(this.oneBot.uin, "V12", "sendGroupPoke", [group_id, user_id]);
+    }
     /**
      * 退出指定群聊
      * @param group_id {number} 群id
@@ -186,5 +189,13 @@ class GroupAction {
     getGroupMemberInfo(group_id, user_id) {
         return this.adapter.call(this.oneBot.uin, "V12", "getGroupMemberInfo", [group_id, user_id]);
     }
+    /**
+     * 设置群公告
+     * @param group_id
+     * @param content
+     */
+    sendGroupNotice(group_id, content) {
+        return this.adapter.call(this.oneBot.uin, "V12", "sendGroupNotice", [group_id, content]);
+    }
 }
 exports.GroupAction = GroupAction;

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

@@ -67,76 +67,6 @@ export declare class V12 extends Service<"V12"> implements OneBot.Base {
     protected _webSocketHandler(ws: WebSocket): void;
 }
 export declare namespace V12 {
-    type Sendable = string | SegmentElem | (string | SegmentElem)[];
-    interface SegmentMap {
-        face: {
-            id: number;
-            text?: string;
-        };
-        text: {
-            text: string;
-        };
-        mention: {
-            user_id: string;
-        };
-        rps: {
-            id?: string;
-        };
-        dice: {
-            id?: string;
-        };
-        poke: {
-            user_id: string;
-        };
-        mention_all: null;
-        image: {
-            file_id: string;
-        };
-        voice: {
-            file_id: string;
-        };
-        audio: {
-            file_id: string;
-        };
-        file: {
-            file_id: string;
-        };
-        music: {
-            type: "163" | "qq" | "xm" | "custom";
-            id?: string;
-            url?: string;
-            audio?: string;
-            title?: string;
-        };
-        location: {
-            latitude: number;
-            longitude: number;
-            title?: string;
-            content?: string;
-        };
-        share: {
-            url: string;
-            title: string;
-            content?: string;
-            image?: string;
-        };
-        reply: {
-            message_id: string;
-        };
-        node: {
-            user_id: string;
-            time?: number;
-            user_name?: string;
-            message: SegmentElem[];
-        };
-        forward: {
-            nodes: SegmentElem<"node">[];
-        };
-    }
-    type SegmentElem<K extends keyof SegmentMap = keyof SegmentMap> = {
-        type: K;
-        data: SegmentMap[K];
-    };
     interface Config {
         heartbeat?: number;
         access_token?: string;
@@ -263,11 +193,14 @@ export declare namespace V12 {
         user_name: string;
     }
     interface Segment {
+        type: string;
+        data: Dict;
     }
+    type Sendable = string | Segment | (string | Segment)[];
     interface Message {
+        message: Sendable;
     }
-    interface MessageElement extends Dict {
-        type: string;
+    interface Message {
     }
     interface MessageRet {
         message_id: string;

package/lib/service/V12/index.js

@@ -394,6 +394,9 @@ class V12 extends service_1.Service {
                 user_id: `${this.oneBot.uin}`,
             },
         });
+        if (payload.message && payload.type === "message") {
+            payload.message = this.adapter.transformMessage(this.oneBot.uin, "V12", payload.message);
+        }
         if (!this.filterFn(payload))
             return;
         this.emit("dispatch", payload);
@@ -442,13 +445,7 @@ class V12 extends service_1.Service {
                             }
                             params[k] = this.adapter.fromCqcode("V12", params[k]);
                         }
-                        else {
-                            if (params[k][0].type == "music" && params[k][0]?.data?.type) {
-                                params[k][0].data.platform = params[k][0].data.type;
-                                delete params[k][0].data.type;
-                            }
-                            params[k] = this.adapter.fromSegment("V12", params[k]);
-                        }
+                        params[k] = this.adapter.fromSegment("V12", params[k]);
                     }
                     args.push(params[k]);
                 }
@@ -622,6 +619,7 @@ class V12 extends service_1.Service {
         const headers = {
             "User-Agent": `OneBot/12 (${this.oneBot.platform}) onebots/${utils_1.version}`,
         };
+        console.log(config);
         if (config.access_token)
             headers.Authorization = "Bearer " + config.access_token;
         const ws = new ws_1.WebSocket(remoteUrl, ["12.OneBots"], { headers });
@@ -655,7 +653,7 @@ class V12 extends service_1.Service {
             try {
                 data = JSON.parse(String(msg));
                 let ret;
-                if (data.action.startsWith(".handle_quick_operation")) {
+                if (data.action?.startsWith(".handle_quick_operation")) {
                     const event = data.params.context, res = data.params.operation;
                     this._quickOperate(event, res);
                     ret = JSON.stringify({
@@ -707,7 +705,6 @@ class V12 extends service_1.Service {
 }
 exports.V12 = V12;
 (function (V12) {
-    const fileTypes = ["image", "file", "record", "video", "flash"];
     V12.defaultConfig = {
         heartbeat: 3,
         access_token: "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.4.59",
+  "version": "0.4.61",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"
@@ -28,14 +28,17 @@
   "keywords": [
     "onebot",
     "icqq",
+    "qq",
+    "wechat",
+    "dingtalk",
     "cq-http"
   ],
   "author": "凉菜",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/liucl-cn/onebots/issues"
+    "url": "https://github.com/lc-cn/onebots/issues"
   },
-  "homepage": "https://github.com/liucl-cn/onebots#readme",
+  "homepage": "https://github.com/lc-cn/onebots#readme",
   "devDependencies": {
     "@types/koa": "^2.13.4",
     "@types/koa__router": "^8.0.11",