oicq-icalingua-plus-plus 1.26.13 → 1.26.16

package/http-api/README.md

@@ -158,6 +158,7 @@ notice事件有部分格式默认与cqhttp中的格式不同。
 |群组文件|表现为CQ码              |notice.group_upload    |
 |群戳一戳|notice.group.poke      |                       |
 |群设置变|notice.group.setting   |                       |
+|表情回应|notice.group.reaction  |                       |
 |元事件|meta_event.lifecycle.enable|meta_event.lifecycle.enable|
 |元事件|meta_event.lifecycle.disable|meta_event.lifecycle.disable|
 |元事件|meta_event.lifecycle.connect|meta_event.lifecycle.connect|

package/index.d.ts

@@ -210,7 +210,7 @@ export interface MemberInfo extends MemberBaseInfo {
 
 /**
  * 使用cqhttp风格的消息元素类型
- * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md 在此基础上进行了扩展
+ * @see https://github.com/botuniverse/onebot/blob/main/specs/interface/message/segments.md 在此基础上进行了扩展
  */
 export type MessageElem = TextElem | AtElem | FaceElem | BfaceElem | MfaceElem |
     ImgPttElem | LocationElem | MusicElem | ShareElem | JsonElem | XmlElem |
@@ -623,6 +623,15 @@ export interface GroupEssenceEventData extends CommonGroupNoticeEventData {
     operator_id: number, //操作者
     operator_name: string, //操作者昵称
 }
+/** 群表情回应 */
+export interface GroupReactionEvent extends CommonGroupNoticeEventData {
+    sub_type: "reaction"; //群表情回应
+    user_id: number; //设置回应者
+    id: string; //回应的表情id
+    type: number; //回应的表情类型
+    seq: number; //消息seq
+    set: boolean; //设置/取消回应
+}
 export interface MemberIncreaseEventData extends CommonGroupNoticeEventData {
     sub_type: "increase", //群增加或群员增加
     group_id: number,
@@ -936,6 +945,8 @@ export interface EventMap {
     "notice.group.sign": (this: Client, data: GroupSignEventData) => void;
     /**群精华事件 */
     "notice.group.essence": (this: Client, data: GroupEssenceEventData) => void;
+    /**群表情回应事件 */
+    "notice.group.reaction": (this: Client, data: GroupReactionEventData) => void;
     /**群设置变更事件 */
     "notice.group.setting": (this: Client, data: GroupSettingEventData) => void;
     /**监听以上所有好友notice事件 */
@@ -1127,6 +1138,8 @@ export class Client extends EventEmitter {
     sendGroupSign(group_id: number): Promise<Ret>;
     /** 设置群备注名 */
     setGroupRemark(group_id: number, remark: string): Promise<Ret>;
+    /** 设置群消息表情回应 */
+    setEmojiReaction(group_id: number, msg_seq: number, id: string, type?: number, set?: boolean): Promise<Ret>;
 
     /** 处理好友请求 */
     setFriendAddRequest(flag: string, approve?: boolean, remark?: string, block?: boolean): Promise<Ret>;

package/lib/client.js

@@ -550,6 +550,9 @@ class Client extends EventEmitter {
     setGroupRemark(group_id, remark = "") {
         return this._useProtocol(troop.setGroupRemark, arguments);
     }
+    setEmojiReaction(group_id, msg_seq, id, type = 1, set = true) {
+        return this._useProtocol(troop.setEmojiReaction, arguments);
+    }
 
     ///////////////////////////////////////////////////
 

package/lib/core/friendlist.js

@@ -456,6 +456,7 @@ async function getSI(user_id, no_cache = false) {
  * @returns {Promise<number>}
  */
 async function uid2uin(uid) {
+    if (Number.isInteger(Number(uid))) return Number(uid); // 纯数字的uid是误调用的uin，直接返回
     if (this.uid2uin_map.has(uid))
         return this.uid2uin_map.get(uid);
     const body = pb.encode({

package/lib/core/troop.js

@@ -660,10 +660,33 @@ async function setFriendRemark(user_id, remark) {
     const rsp = jce.decode(blob);
     return { result: rsp[0] };
 }
+/**
+ * 设置表情回应，参考（https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType）
+ * @this {import("./ref").Client}
+ * @param {number} group_id
+ * @param {number} msg_seq
+ * @param {string} id
+ * @param {number} type
+ * @param {boolean} set
+ * @returns {import("./ref").ProtocolResponse}
+ */
+async function setEmojiReaction(group_id, msg_seq, id, type = 1, set = true) {
+    [group_id] = uinAutoCheck(group_id);
+    const body = pb.encode({
+        2: group_id,
+        3: msg_seq,
+        4: String(id),
+        5: type,
+    });
+    const cmd = set ? "OidbSvcTrpcTcp.0x9082_1" : "OidbSvcTrpcTcp.0x9082_2";
+    const blob = await this.sendOidb(cmd, body);
+    const rsp = pb.decode(blob);
+    return { result: rsp[3] };
+}
 
 module.exports = {
     setAdmin, setTitle, setCard, setting, setAnonymous, muteAnonymous, getGroupNotice,
     kickMember, muteMember, pokeMember, quitGroup, addGroup, inviteFriend,
     setProfile, setSignature, addFriend, delFriend, setPortrait, setGroupPortrait,
-    groupSign, getSignature, setGroupRemark, setFriendRemark
+    groupSign, getSignature, setGroupRemark, setFriendRemark, setEmojiReaction, 
 };

package/lib/message/parser.js

@@ -1087,16 +1087,18 @@ async function parseForwardMsg(resid, fileName) {
     /**
      * @type {import("../ref").Msg[]}
      */
-    let msgs = pb.decode(blob)[2];
+    let msgs = pb.decode(blob)[2], flag = false;
     if (!Array.isArray(msgs))
         msgs = [msgs];
     for (let msg1 of msgs) {
         const m_fileName = msg1[1].toString();
         if (m_fileName === fileName) {
             msgs = msg1;
+            flag = true;
             break;
         }
     }
+    if (!flag) throw new Error("wrong fileName");
     if (Array.isArray(msgs))
         msgs = msgs[0];
     msgs = msgs[2][1];

package/lib/onlinepush.js

@@ -6,7 +6,7 @@
 const pb = require("./algo/pb");
 const jce = require("./algo/jce");
 const sysmsg = require("./core/sysmsg");
-const { parseC2CMsg ,parseGroupMsg, parseDiscussMsg } = require("./message/parser");
+const { parseC2CMsg, parseGroupMsg, parseDiscussMsg } = require("./message/parser");
 const { genC2CMessageId, genGroupMessageId, log, uin2code, BUF0, timestamp } = require("./common");
 const { updateFL, uid2uin } = require("./core/friendlist");
 
@@ -62,14 +62,8 @@ const sub0x27 = {
     5: async function (data, time) {
         let user_id = data[14][1];
         let nickname = "";
-        if (typeof user_id !== "number") {
-            return; //似乎还有老的推送，暂时没必要转换
-            if (this.config.useNT) {
-                //nt uid
-                user_id = await uid2uin.call(this, String(user_id));
-            } else {
-                return;
-            }
+        if (this.config.useNT) {
+            user_id = await uid2uin.call(this, user_id);
         }
         try {
             nickname = this.fl.get(user_id).nickname;
@@ -80,50 +74,58 @@ const sub0x27 = {
             user_id, nickname, time
         });
     },
-    20: function (data, time) {
+    20: async function (data, time) {
         // 20002昵称 20009性别 20031生日 23109农历生日 20019说明 20032地区 24002故乡 27372在线状态
-        const user_id = data[8][1];
-        let o = data[8][2];
-        if (Array.isArray(o)) {
-            o = o[0];
+        let user_id = data[8][1];
+        if (this.config.useNT) {
+            user_id = await uid2uin.call(this, String(user_id));
         }
-        let key, value;
-        if (o[1] === 20002) {
-            key = "nickname";
-            value = String(o[2]);
-        } else if (o[1] === 20009) {
-            key = "sex";
-            value = ["unknown", "male", "female"][o[2].toBuffer()[0]];
-        } else if (o[1] === 20031) {
-            key = "age";
-            value = new Date().getFullYear() - o[2].toBuffer().readUInt16BE();
-        } else if (o[1] === 20019) {
-            key = "description";
-            value = String(o[2]);
-        } else if (o[1] === 27372 && user_id === this.uin) {
-            const status = o[2].toBuffer()[o[2].toBuffer().length - 1];
-            const old_status = this.online_status, new_status = status_map[status] || 11;
-            this.online_status = new_status;
-            if (old_status !== new_status)
-                this.em("sync.status", { old_status, new_status });
-            return
-        } else {
-            return;
+        let list = data[8][2];
+        if (!Array.isArray(list)) {
+            list = [list];
         }
-        try {
-            this.fl.get(user_id)[key] = value;
-        } catch (e) { }
-        if (user_id === this.uin) {
-            this[key] = value;
-            this.em("sync.profile", { [key]: value });
-        } else {
-            const e = { user_id, time };
-            e[key] = value;
-            this.em("notice.friend.profile", e);
+        for (let o of list) {
+            let key, value;
+            if (o[1] === 20002) {
+                key = "nickname";
+                value = String(o[2]);
+            } else if (o[1] === 20009) {
+                key = "sex";
+                value = ["unknown", "male", "female"][o[2].toBuffer()[0]];
+            } else if (o[1] === 20031) {
+                key = "age";
+                value = new Date().getFullYear() - o[2].toBuffer().readUInt16BE();
+            } else if (o[1] === 20019) {
+                key = "description";
+                value = String(o[2]);
+            } else if (o[1] === 27372 && user_id === this.uin) {
+                const status = o[2].toBuffer()[o[2].toBuffer().length - 1];
+                const old_status = this.online_status, new_status = status_map[status] || 11;
+                this.online_status = new_status;
+                if (old_status !== new_status)
+                    this.em("sync.status", { old_status, new_status });
+                continue;
+            } else {
+                continue;
+            }
+            try {
+                this.fl.get(user_id)[key] = value;
+            } catch (e) { }
+            if (user_id === this.uin) {
+                this[key] = value;
+                this.em("sync.profile", { [key]: value });
+            } else {
+                const e = { user_id, time };
+                e[key] = value;
+                this.em("notice.friend.profile", e);
+            }
         }
     },
-    60: function (data, time) {
-        const user_id = data[10][1];
+    60: async function (data, time) {
+        let user_id = data[10][1];
+        if (this.config.useNT) {
+            user_id = await uid2uin.call(this, String(user_id));
+        }
         const sign = String(data[10][2]);
         try {
             this.fl.get(user_id).signature = sign;
@@ -137,9 +139,13 @@ const sub0x27 = {
             });
         }
     },
-    40: function (data, time) {
+    40: async function (data, time) {
         try {
-            const o = data[9][1], user_id = o[2];
+            const o = data[9][1];
+            let user_id = o[2];
+            if (this.config.useNT) {
+                user_id = await uid2uin.call(this, String(user_id));
+            }
             const remark = String(o[3]);
             // 0好友备注 1群备注
             if (o[1] === 1) {
@@ -151,15 +157,16 @@ const sub0x27 = {
             }
         } catch (e) { }
     },
-    21: function (data, time) {
-        if (data[11][1] === 0) {
-            this.em("sync.profile", { avatar: true });
-        } else if (data[11][1] === 1) {
+    21: async function (data, time) {
+        if (data[11] && data[11][1] === 1) {
+            const user_id = data[11][4]; //这里NT上线也是uin，不需要转换
             this.em("notice.group.setting", {
                 group_id: data[11][3], time,
-                user_id: data[11][4],
+                user_id: user_id,
                 avatar: true,
             });
+        } else {
+            this.em("sync.profile", { avatar: true });
         }
     }
 };
@@ -193,14 +200,8 @@ const push528 = {
     0xB3: async function (buf, time) {
         const data = pb.decode(buf)[2];
         let user_id = data[1], nickname = String(data[5]);
-        if (typeof user_id !== "number") {
-            return; //似乎还有老的推送，暂时没必要转换
-            if (this.config.useNT) {
-                //nt uid
-                user_id = await uid2uin.call(this, String(user_id));
-            } else {
-                return;
-            }
+        if (this.config.useNT) {
+            user_id = await uid2uin.call(this, String(user_id));
         }
         this.fl.set(user_id, {
             user_id, nickname,
@@ -248,13 +249,8 @@ const push528 = {
     0x115: async function (buf, time) {
         const data = pb.decode(buf);
         let user_id = data[1];
-        if (typeof user_id !== "number") {
-            if (this.config.useNT) {
-                //nt uid
-                user_id = await uid2uin.call(this, String(user_id));
-            } else {
-                return;
-            }
+        if (this.config.useNT) {
+            user_id = await uid2uin.call(this, String(user_id));
         }
         const end = data[3][4] === 2;
         this.em("internal.input", { user_id, end });
@@ -282,19 +278,19 @@ function parsePoke(data) {
     for (let o of data[7]) {
         const name = String(o[1]), val = String(o[2]);
         switch (name) {
-        case "action_str":
-        case "alt_str1":
-            action = action || val;
-            break;
-        case "uin_str1":
-            operator_id = parseInt(val);
-            break;
-        case "uin_str2":
-            user_id = parseInt(val);
-            break;
-        case "suffix_str":
-            suffix = val;
-            break;
+            case "action_str":
+            case "alt_str1":
+                action = action || val;
+                break;
+            case "uin_str1":
+                operator_id = parseInt(val);
+                break;
+            case "uin_str2":
+                user_id = parseInt(val);
+                break;
+            case "suffix_str":
+                suffix = val;
+                break;
         }
     }
     if (!operator_id)
@@ -310,15 +306,15 @@ function parseSign(data) {
     for (let o of data[7]) {
         const name = String(o[1]), val = String(o[2]);
         switch (name) {
-        case "user_sign":
-            sign_text = sign_text || val;
-            break;
-        case "mqq_uin":
-            user_id = parseInt(val);
-            break;
-        case "mqq_nick":
-            nickname = val;
-            break;
+            case "user_sign":
+                sign_text = sign_text || val;
+                break;
+            case "mqq_uin":
+                user_id = parseInt(val);
+                break;
+            case "mqq_nick":
+                nickname = val;
+                break;
         }
     }
     return { user_id, nickname, sign_text };
@@ -330,11 +326,12 @@ function parseSign(data) {
  * @param {string} field 
  * @param {boolean} enable 
  * @param {number} time 
+ * @param {number} user_id
  */
-function onGroupSetting(group_id, field, enable, time) {
+function onGroupSetting(group_id, field, enable, time, user_id) {
     if (!field) return;
     const e = {
-        group_id, time
+        group_id, time, user_id
     };
     e[field] = !!enable;
     this.em("notice.group.setting", e);
@@ -344,10 +341,18 @@ function onGroupSetting(group_id, field, enable, time) {
  * @type {({[k: number]: (this: import("./ref").Client, group_id: number, buf: Buffer, time: number) => void})}
  */
 const push732 = {
-    0x0C: function (group_id, buf, time) {
-        const operator_id = buf.readUInt32BE(6);
-        const user_id = buf.readUInt32BE(16);
-        let duration = buf.readUInt32BE(20);
+    0x0C: async function (group_id, buf, time) {
+        let operator_id, user_id, duration;
+        if (this.config.useNT) {
+            const o = pb.decode(buf);
+            operator_id = await uid2uin.call(this, String(o[4]));
+            user_id = o[5][3][1] ? await uid2uin.call(this, String(o[5][3][1])) : 0;
+            duration = o[5][3][2];
+        } else {
+            operator_id = buf.readUInt32BE(6);
+            user_id = buf.readUInt32BE(16);
+            duration = buf.readUInt32BE(20);
+        }
         try {
             if (user_id === 0) {
                 duration = duration ? 0xffffffff : 0;
@@ -369,10 +374,8 @@ const push732 = {
         let user_id = msg[6];
         if (this.config.useNT) {
             //nt uid
-            //await this.getGroupMemberList(group_id);
-            user_id = String(user_id), operator_id = String(operator_id);
-            user_id = await uid2uin.call(this, user_id);
-            operator_id = await uid2uin.call(this, operator_id);
+            user_id = await uid2uin.call(this, String(user_id));
+            operator_id = await uid2uin.call(this, String(operator_id));
         }
         const message_id = genGroupMessageId(group_id, user_id, msg[1], msg[3], msg[2], Array.isArray(data[3]) ? data[3].length : 1);
         this.em("notice.group.recall", {
@@ -437,20 +440,66 @@ const push732 = {
         var enable = buf[8] === 0x0 || buf[8] === 0x20;
         onGroupSetting.call(this, group_id, field, enable, time);
     },
-    0x10: function (group_id, buf, time) {
-        if (buf[6] === 0x22) {
-            let field;
-            if (buf[buf.length - 2] === 0x08)
-                field = "enable_show_honor";
-            if (buf[buf.length - 2] === 0x10)
-                field = "enable_show_level";
-            let enable = buf[buf.length - 1] === 0;
-            return onGroupSetting.call(this, group_id, field, enable, time);
-        }
+    0x10: async function (group_id, buf, time) {
         if (buf[6] === 0x26) {
             // 改群分类 <Buffer 44 25 6e 9f 10 00 26 08 18 10 96 8a e3 fa 05 18 ff ff ff ff 0f 20 9f dd 95 a1 04 68 17 a8 01 f5 ef e8 b1 01 f2 01 06 18 8c 04 40 9a 4e>
         }
         const sub = pb.decode(buf.slice(7));
+        const sub_type = sub[13];
+        switch (sub_type) {
+            case 23: { // 群荣誉相关设置
+                const data = sub[30];
+                const field_map = {
+                    1: "enable_show_honor",
+                    2: "enable_show_level",
+                };
+                for (let field of Object.keys(field_map)) {
+                    if (data[field] != null) {
+                        const enable = data[field] === 0;
+                        let user_id = sub[21];
+                        if (this.config.useNT) {
+                            user_id = await uid2uin.call(this, String(user_id));
+                        }
+                        onGroupSetting.call(this, group_id, field_map[field], enable, time, user_id);
+                    }
+                }
+                return;
+            }
+            case 12: { // 群名称修改
+                let user_id = sub[21];
+                if (this.config.useNT) {
+                    user_id = await uid2uin.call(this, String(user_id));
+                }
+                const group_name = String(sub[5][2]);
+                try {
+                    this.gl.get(group_id).group_name = group_name;
+                } catch (e) { }
+                return this.em("notice.group.setting", {
+                    group_id, time,
+                    user_id: user_id,
+                    group_name: group_name,
+                });
+                return;
+            }
+            case 35: { // 消息回应
+                const data = sub[44];
+                let user_id = data[1][1][3][4];
+                if (this.config.useNT) {
+                    user_id = await uid2uin.call(this, String(user_id));
+                }
+                const set = data[1][1][3][5] === 1;
+                return this.em("notice.group.reaction", {
+                    group_id, time,
+                    user_id: user_id,
+                    id: String(data[1][1][3][1]),
+                    type: data[1][1][3][2],
+                    seq: data[1][1][2][1],
+                    set,
+                });
+            }
+            default:
+                break;
+        }
         if (sub[5] && sub[5][2]) {
             let str = String(sub[5][2]);
             if (str.includes("获得群主授予的")) {
@@ -495,15 +544,7 @@ const push732 = {
             }
 
             let field, enable;
-            if (sub[13] === 12) {
-                try {
-                    this.gl.get(group_id).group_name = str;
-                } catch (e) { }
-                return this.em("notice.group.setting", {
-                    group_id, time,
-                    user_id: sub[21],
-                    group_name: str,
-                });
+            if (sub[13]) {
             } else if (str.includes("坦白说")) {
                 field = "enable_confess";
                 enable = str.includes("开启");
@@ -542,6 +583,7 @@ function onlinePushListener(blob, seq) {
             this.uin, v[1], v[3], v[8], 0, 0, 0, 0, 0, 0, 0
         ]));
         if (!this.sync_finished) continue;
+        if (this.config.useNT) continue; // NT上线忽略老推送
         const time = v[5];
         if (v[2] === 528) {
             const decoded = jce.decodeNested(v[6]);
@@ -566,6 +608,7 @@ function onlinePushTransListener(blob, seq) {
     const push = pb.decode(blob);
     handleOnlinePush.call(this, push[11], seq);
     if (!this.sync_finished) return;
+    if (this.config.useNT) return; // NT上线忽略老推送
     const time = push[8];
     const buf = push[10].toBuffer();
     const group_id = buf.readUInt32BE();
@@ -671,7 +714,7 @@ async function groupMsgListener(blob, seq) {
             //重组分片消息
             if (content[2] === 0)
                 this.emit(`interval.${group_id}.${body[1][1][3]}`, message_id);
-            msg = rebuildFragments(msg);
+            msg = rebuildFragments(msg, group_id, this.uin, user_id);
             if (!msg)
                 return;
         } else {
@@ -728,14 +771,17 @@ const FRAG = new Map;
  * 1.是最后一个分片，返回组装好的消息
  * 2.不是最后一个分片，返回空
  * @param {import("./ref").Msg} msg 
+ * @param {number} chat_id
+ * @param {number} self_id
+ * @param {number} user_id
  * @returns {import("./ref").Msg}
  */
-function rebuildFragments(msg) {
+function rebuildFragments(msg, chat_id, self_id, user_id) {
     const head = msg[1], content = msg[2], body = msg[3];
-    const cnt = content[1], index = content[2], div = content[3];
-    const id = head[1] + "-" + head[2] + "-" + div;
+    const cnt = content[1] || 0, index = content[2] || 0, div = content[3] || 0;
+    const id = self_id + "-" + user_id + "-" + chat_id + "-" + div; //self_id-user_id-chat_id-div
     if (!FRAG.has(id)) {
-        FRAG.set(id, {3: new Array(cnt)});
+        FRAG.set(id, { 3: new Array(cnt) });
         setTimeout(() => {
             FRAG.delete(id);
         }, 5000);
@@ -771,6 +817,20 @@ async function NTMsgListener(blob, seq, sso) {
     const o = pb.decode(blob);
     const type = o[1][2] ? o[1][2][1] : 114514;
     //this.logger.debug("NT message type", type);
+    if (o[4]) {
+        let trans_info = BUF0;
+        try {
+            const trans_info = pb.decode(sso.reserved)[23] || BUF0;
+        } catch (e) {
+            this.logger.debug(e);
+        }
+        this.writeUni("trpc.msg.olpush.OlPushService.SsoPushAck", pb.encode({
+            1: o[4],
+        }), undefined, {
+            trans_info: trans_info,
+            nt_core: true,
+        });
+    }
     switch (type) {
         case 82: //群聊消息
             if (!this.sync_finished) return;
@@ -782,8 +842,19 @@ async function NTMsgListener(blob, seq, sso) {
                 const user_id = head[1], time = head[6], seq = head[5];
                 const group_id = head[9][1], random = body[1][1][3];
                 const message_id = genGroupMessageId(group_id, user_id, seq, random, time, content[1]);
-                //懒得搞分片消息了
-                this.emit(`interval.${group_id}.${body[1][1][3]}`, message_id);
+
+                if (content[1] > 1) {
+                    //重组分片消息
+                    if (content[2] === 0)
+                        this.emit(`interval.${group_id}.${body[1][1][3]}`, message_id);
+                    msg = rebuildFragments(msg, group_id, this.uin, user_id);
+                    if (!msg)
+                        return;
+                } else {
+                    //非分片消息
+                    this.emit(`interval.${group_id}.${body[1][1][3]}`, message_id);
+                }
+
                 ++this.stat.recv_msg_cnt;
                 //解析消息
                 const data = await parseGroupMsg.call(this, msg, true);
@@ -859,6 +930,17 @@ async function NTMsgListener(blob, seq, sso) {
             if (!this.sync_finished) return;
             try {
                 const msg = c2cNTMsgConverter.call(this, o[1]);
+                const user_id = msg[1][1];
+
+                if (msg[2][1] > 1) {
+                    //重组分片消息
+                    msg = rebuildFragments(msg, -user_id, this.uin, user_id);
+                    if (!msg)
+                        return;
+                } else {
+                    //非分片消息
+                }
+
                 const data = await parseC2CMsg.call(this, msg, true);
                 if (data.user_id === this.uin) {
                     data.user_id = msg[1][2];
@@ -898,8 +980,6 @@ async function NTMsgListener(blob, seq, sso) {
                 const group_uin = o[1][1][1];
                 const group_id = uin2code(group_uin);
                 const type = o[1][2][3], buf = o[1][3][2].toBuffer(), time = o[1][2][6];
-                const no_parse = [0x0C, 0x10]; //这些也会推送jce的老包，就不管其只有uid的nt推送了
-                if (no_parse.includes(type)) break;
                 if (!this.sync_finished) throw new Error("sync not finished");
                 if (typeof push732[type] === "function")
                     push732[type].call(this, group_id, buf, time);
@@ -907,6 +987,75 @@ async function NTMsgListener(blob, seq, sso) {
                 this.logger.debug(e);
             }
             break;
+        case 44: //群管理权限变动
+            try {
+                const group_id = uin2code(o[1][1][1]);
+                const msg = o[1][3][2], time = o[1][2][6];
+                const type = msg[3];
+                if (type === 0 || type === 1) {
+                    const data = msg[4][type === 0 ? 1 : 2];
+                    const user_id = await uid2uin.call(this, String(data[1]));
+                    const set = data[2] === 1;
+                    try {
+                        (await this.getGroupMemberInfo(group_id, user_id)).data.role = (set ? "admin" : "member");
+                    } catch (e) { }
+                    this.em("notice.group.admin", {
+                        group_id, user_id, set, time
+                    });
+                } else if (type === 0xFF) {
+                    const operator_id = await uid2uin.call(this, String(msg[4][3][1])),
+                        user_id = await uid2uin.call(this, String(msg[4][3][2]));
+                    try {
+                        this.gl.get(group_id).owner_id = user_id;
+                        (await this.getGroupMemberInfo(group_id, operator_id)).data.role = "member";
+                        (await this.getGroupMemberInfo(group_id, user_id)).data.role = "owner";
+                    } catch (e) { }
+                    this.em("notice.group.transfer", {
+                        group_id, operator_id, user_id, time
+                    });
+                }
+            } catch (e) {
+                this.logger.debug(e);
+            }
+            break;
+        case 34: //群成员离开
+            try {
+                const group_id = uin2code(o[1][1][1]);
+                const msg = o[1][3][2], time = o[1][2][6];
+                const user_id = await uid2uin.call(this, String(msg[3]));
+                const exit_type = msg[4];
+                let operator_id, dismiss = false, member, group;
+                if (exit_type === 0x82 || exit_type === 0x2) {
+                    operator_id = user_id;
+                    try {
+                        this.gml.get(group_id).delete(user_id);
+                    } catch { }
+                } else {
+                    operator_id = msg[5] && msg[5][1] ? await uid2uin.call(this, String(msg[5][1][1])) : user_id;
+                    if (exit_type === 0x01 || exit_type === 0x81)
+                        dismiss = true;
+                    if (user_id === this.uin) {
+                        group = this.gl.get(group_id);
+                        this.gl.delete(group_id);
+                        this.gml.delete(group_id);
+                        this.logger.info(`更新了群列表，删除了群：${group_id}`);
+                    } else {
+                        try {
+                            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, dismiss, member, group, time
+                });
+            } catch (e) {
+                this.logger.debug(e);
+            }
+            break;
         case 114514: // 1919810
             // 部分消息没有content
             break;
@@ -914,20 +1063,6 @@ async function NTMsgListener(blob, seq, sso) {
             this.logger.warn("Unknown NT message type", type);
             break;
     }
-    if (o[4]) {
-        let trans_info = BUF0;
-        try {
-            const trans_info = pb.decode(sso.reserved)[23] || BUF0;
-        } catch (e) {
-            this.logger.debug(e);
-        }
-        this.writeUni("trpc.msg.olpush.OlPushService.SsoPushAck", pb.encode({
-            1: o[4],
-        }), undefined, {
-            trans_info: trans_info,
-            nt_core: true,
-        });
-    }
 }
 
 /**
@@ -949,6 +1084,8 @@ function groupNTMsgConverter(msg) {
     header[11] = headerNT[4];
 
     content[1] = contentNT[7];
+    content[2] = contentNT[8];
+    content[3] = contentNT[9];
 
     return {
         1: header,
@@ -981,6 +1118,9 @@ function c2cNTMsgConverter(msg) {
     return {
         1: header,
         2: {
+            1: contentNT[7],
+            2: contentNT[8],
+            3: contentNT[9],
             4: contentNT[10], //auto_reply
         },
         3: body,

package/package.json

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