oicq-icalingua-plus-plus 1.26.16 → 1.26.18

package/index.d.ts

@@ -215,7 +215,7 @@ export interface MemberInfo extends MemberBaseInfo {
 export type MessageElem = TextElem | AtElem | FaceElem | BfaceElem | MfaceElem |
     ImgPttElem | LocationElem | MusicElem | ShareElem | JsonElem | XmlElem |
     AnonymousElem | ReplyElem | NodeElem | ShakeElem | PokeElem | FileElem | VideoElem |
-    MiraiElem | RawElem | MarkdownElem;
+    MiraiElem | RawElem | MarkdownElem | ButtonElem;
 
 export type Sendable = string | MessageElem | Iterable<MessageElem | string>
 
@@ -409,6 +409,60 @@ export interface MarkdownElem {
         }
     }
 }
+
+/** Markdown按钮消息 */
+export interface ButtonElem {
+    type: "button",
+    data: {
+        /** 机器人appid */
+        appid: number,
+        rows: {
+            buttons: Button[]
+        }[]
+    }
+}
+
+export interface Button {
+    /** 按钮ID：在一个keyboard消息内设置唯一 */
+    id?: string;
+    render_data: {
+        /** 按钮上的文字 */
+        label: string;
+        /** 点击后按钮的上文字 */
+        visited_label: string;
+        /** 按钮样式：0 灰色线框，1 蓝色线框 */
+        style: number;
+    };
+    action: {
+        /** 设置 0 跳转按钮：http 或 小程序 客户端识别 scheme，设置 1 回调按钮：回调后台接口, data 传给后台，设置 2 指令按钮：自动在输入框插入 @bot data */
+        type: number;
+        permission: {
+            /** 0 指定用户可操作，1 仅管理者可操作，2 所有人可操作，3 指定身份组可操作（仅频道可用） */
+            type: number;
+            /** 有权限的用户 id 的列表 */
+            specify_user_ids?: Array<string>;
+            /** 有权限的身份组 id 的列表（仅频道可用） */
+            specify_role_ids?: Array<string>;
+        };
+        /** 操作相关的数据 */
+        data: string;
+        /** 指令按钮可用，指令是否带引用回复本消息，默认 false。支持版本 8983 */
+        reply?: boolean;
+        /** 指令按钮可用，点击按钮后直接自动发送 data，默认 false。支持版本 8983 */
+        enter?: boolean;
+        /** 本字段仅在指令按钮下有效，设置后后会忽略 action.enter 配置。
+        设置为 1 时 ，点击按钮自动唤起启手Q选图器，其他值暂无效果。
+        （仅支持手机端版本 8983+ 的单聊场景，桌面端不支持） */
+        anchor?: number;
+        /** 【已弃用】可操作点击的次数，默认不限 */
+        click_limit?: number;
+        /** 【已弃用】指令按钮可用，弹出子频道选择器，默认 false */
+        at_bot_show_channel_list?: boolean;
+        /** 客户端不支持本action的时候，弹出的toast文案 */
+        unsupport_tips: string;
+    };
+}
+
 /** 该元素为需要直接发送的原始消息体，JSON 格式 */
 export interface RawElem {
     type: "raw",

package/lib/core/nessy.js

@@ -134,6 +134,7 @@ async function getRoamingStamp(no_cache = false) {
             },
             2: this.uin,
             3: 1,
+            6: 1,
         });
         const blob = await this.sendUni("Faceroam.OpReq", body);
         const rsp = pb.decode(blob);

package/lib/message/parser.js

@@ -423,8 +423,54 @@ class Parser {
             }
             break;
         case 46: //markdown button
-            //TODO
-            return;
+            msg.type = "button";
+            try {
+                const body = elem[2][1];
+                const appid = body[2];
+                const rows = Array.isArray(body[1]) ? body[1] : [body[1]];
+                msg.data = {
+                    appid: appid,
+                    rows: [],
+                };
+                for (const row of rows) {
+                    const cols = Array.isArray(row[1]) ? row[1] : [row[1]];
+                    const buttons = [];
+                    for (const col of cols) {
+                        /**
+                         * @type {import("../../index").Button}
+                         */
+                        const btn = {
+                            id: "",
+                            render_data: {},
+                            action: {
+                                permission: {},
+                            },
+                        };
+                        if (col[1]) btn.id = String(col[1]);
+                        if (col[2]) {
+                            btn.render_data.label = String(col[2][1] || "");
+                            btn.render_data.visited_label = String(col[2][2] || "");
+                            btn.render_data.style = Number(col[2][3]) || 0;
+                        }
+                        if (col[3]) {
+                            btn.action.type = Number(col[3][1]) || 0;
+                            btn.action.unsupport_tips = String(col[3][4] || "");
+                            btn.action.data = String(col[3][5] || "");
+                            btn.action.reply = col[3][7] === 1;
+                            btn.action.enter = col[3][8] === 1;
+                            if (col[3][2]) {
+                                btn.action.permission.type = Number(col[3][2][1]) || 0;
+                                btn.action.permission.specify_role_ids = col[3][2][2] || [];
+                                btn.action.permission.specify_user_ids = col[3][2][3] || [];
+                            }
+                        }
+                        buttons.push(btn);
+                    }
+                    msg.data.rows.push({ buttons });
+                }
+            } catch (e) {
+                this.c.logger.error("解析markdown button失败", e);
+            }
             break;
         case 48: //ntv2richmedia
             const businessType = elem[3];
@@ -567,6 +613,8 @@ class Parser {
                         await this.parsePartialElem(48, elem);
                     } else if (elem[1] == 45) { //markdown
                         await this.parsePartialElem(45, elem[2]);
+                    } else if (elem[1] == 46) { //markdown button
+                        await this.parsePartialElem(46, elem[2]);
                     }
                     break;
                 case 45: //reply

package/lib/onlinepush.js

@@ -404,8 +404,8 @@ const push732 = {
             const seq = data[2];
             const random = data[3];
             const add = data[4] === 1;
-            const user_id = data[5];
-            const operator_id = data[6];
+            const user_id = data[5]; //这里NT上线也是uin，不需要转换
+            const operator_id = data[6]; //这里NT上线也是uin，不需要转换
             const user_name = String(data[10]);
             const operator_name = String(data[9]);
             this.em("notice.group.essence", {
@@ -497,13 +497,57 @@ const push732 = {
                     set,
                 });
             }
+            case 38: { // 机器人变动
+                const data = sub[47];
+                const is_join = !!data[2];
+                let user_id = is_join ? data[2] : data[3];
+                let nickname = "";
+                user_id = await uid2uin.call(this, String(user_id)); // 这里全是uid，老上线也是
+                try {
+                    if (is_join) {
+                        const ginfo = (await this.getGroupInfo(group_id)).data;
+                        if (!ginfo) return;
+                        ginfo.member_count++;
+                        ginfo.last_join_time = timestamp();
+                        const info = await this.getGroupMemberInfo(group_id, user_id);
+                        nickname = info.data.nickname || info.data.card || "";
+                        try {
+                            if (this.gml.get(group_id).size)
+                                ginfo.member_count = this.gml.get(group_id).size;
+                        } catch { }
+                        this.logger.info(`${user_id}(${nickname}) 加入了群 ${group_id}`);
+                        this.getGroupMemberList(group_id, true);
+                        this.em("notice.group.increase", {
+                            group_id, user_id, nickname
+                        });
+                    } else {
+                        let member, group;
+                        try {
+                            member = this.gml.get(group_id).get(user_id);
+                            this.gml.get(group_id).delete(user_id);
+                        } catch { }
+                        this.logger.info(`${user_id}离开了群${group_id}`);
+                        try {
+                            this.gl.get(group_id).member_count--;
+                        } catch { }
+                        this.em("notice.group.decrease", {
+                            group_id, user_id,
+                            operator_id: user_id, dismiss: false,
+                            member, group, time
+                        });
+                    }
+                } catch (e) {
+                    this.logger.debug(e);
+                }
+                break;
+            }
             default:
                 break;
         }
         if (sub[5] && sub[5][2]) {
             let str = String(sub[5][2]);
             if (str.includes("获得群主授予的")) {
-                const user_id = sub[5][5];
+                const user_id = sub[5][5]; // 这里NT上线也是uin，不需要转换
                 str = str.substr(0, str.length - 2);
                 let title = str.substr(str.lastIndexOf("获得群主授予的") + 7);
                 const _title = title;
@@ -1025,6 +1069,9 @@ async function NTMsgListener(blob, seq, sso) {
                 const user_id = await uid2uin.call(this, String(msg[3]));
                 const exit_type = msg[4];
                 let operator_id, dismiss = false, member, group;
+                try {
+                    member = this.gml.get(group_id).get(user_id);
+                } catch { }
                 if (exit_type === 0x82 || exit_type === 0x2) {
                     operator_id = user_id;
                     try {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.26.16",
-  "app_version": "1.26.16",
-  "upday": "2026/08/09",
+  "version": "1.26.18",
+  "app_version": "1.26.18",
+  "upday": "2026/08/17",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
   "main": "index.js",