oicq-icalingua-plus-plus 1.22.4 → 1.22.8

package/index.d.ts

@@ -962,7 +962,7 @@ export class Client extends EventEmitter {
      * resid在xml消息中，需要自行解析xml获得
      * 暂不支持套娃转发解析
      */
-    getForwardMsg(resid: string): Promise<Ret<Array<{
+    getForwardMsg(resid: string, fileName?: string): Promise<Ret<Array<{
         group_id?: number,
         user_id: number,
         nickname: string,

package/lib/client.js

@@ -372,7 +372,7 @@ class Client extends EventEmitter {
     getChatHistory(message_id, count = 10) {
         return this._useProtocol(chat.getMsgs, arguments);
     }
-    getForwardMsg(id) {
+    getForwardMsg(id, fileName = "MultiMsg") {
         return this._useProtocol(chat.getForwardMsg, arguments);
     }
     makeForwardMsg(fakes, dm = false, target = 0) {

package/lib/device.js

@@ -154,20 +154,32 @@ const apk = {
         bitmap: 150470524,
         sigmap: 1970400,
         sdkver: "6.0.0.2487",
+    },
+
+    //android watch
+    3: {
+        id: "com.tencent.qqlite",
+        name: "A2.0.5",
+        version: "2.0.5",
+        ver: "2.0.5",
+        sign: Buffer.from([166, 183, 69, 191, 36, 162, 194, 119, 82, 119, 22, 246, 243, 110, 182, 141]),
+        buildtime: 1559564731,
+        appid: 16,
+        subid: 537064446,
+        bitmap: 16252796,
+        sigmap: 34869472,
+        sdkver: "6.0.0.236",
     }
 };
 
-//android watch
-apk[3] = { ...apk[1] };
-apk[3].subid = 537061176;
 
 //mac (experimental)
 apk[4] = { ...apk[2] };
-apk[4].subid = 537064315;
+apk[4].subid = 537128930;
 
 //ipad (experimental)
 apk[5] = { ...apk[2] };
-apk[5].subid = 537065739;
+apk[5].subid = 537118796;
 
 /**
  * @param {number} platform 

package/lib/message/chat.js

@@ -232,8 +232,8 @@ async function getMsgs(message_id, count = 20) {
  * @param {string} resid 
  * @returns {import("../ref").ProtocolResponse}
  */
-function getForwardMsg(resid) {
-    return parseForwardMsg.call(this, resid);
+function getForwardMsg(resid, fileName = "MultiMsg") {
+    return parseForwardMsg.call(this, resid, fileName);
 }
 
 /**

package/lib/message/face.js

@@ -264,6 +264,10 @@ const map = {
 	334: "/虎虎生威",
 	335: "/绿马护体",
 	336: "/豹富",
+	337: "/花朵脸",
+	338: "/我想开了",
+	339: "/舔屏",
+	340: "/热化了",
 };
 
 const FACE_OLD_BUF = Buffer.from([0x00, 0x01, 0x00, 0x04, 0x52, 0xCC, 0xF5, 0xD0]);

package/lib/message/parser.js

@@ -473,9 +473,13 @@ class Parser {
             };
             let seq = elem[1], user_id = elem[2];
             if (this.gid) {
-                let m = (await getGroupMsgs.call(this.c, this.gid, seq, seq))[0];
-                let random = m[3][1][1][3];
-                let time = m[1][6];
+                let random = elem[8] ? genRandom(elem[8][3]) : null;
+                let time = elem[3];
+                if (!random || !time) {
+                    let m = (await getGroupMsgs.call(this.c, this.gid, seq, seq))[0];
+                    random = m[3][1][1][3];
+                    time = m[1][6];
+                }
                 msg.data.id = genGroupMessageId(this.gid, user_id, seq, random, time);
             } else {
                 let random = genRandom(elem[8][3]);
@@ -733,13 +737,22 @@ async function parseDiscussMsg(msg) {
  * @param {string} resid 
  * @returns {import("../ref").ProtocolResponse}
  */
-async function parseForwardMsg(resid) {
+async function parseForwardMsg(resid, fileName) {
     const data = [];
     const blob = await _downloadMultiMsg.call(this, String(resid), 2);
     /**
      * @type {import("../ref").Msg[]}
      */
     let msgs = pb.decode(blob)[2];
+    if (!Array.isArray(msgs))
+        msgs = [msgs];
+    for (let msg1 of msgs) {
+        const m_fileName = msg1[1].toString();
+        if (m_fileName === fileName) {
+            msgs = msg1;
+            break;
+        }
+    }
     if (Array.isArray(msgs))
         msgs = msgs[0];
     msgs = msgs[2][1];

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.22.4",
-  "app_version": "1.22.4",
-  "upday": "2022/05/20",
+  "version": "1.22.8",
+  "app_version": "1.22.8",
+  "upday": "2022/08/27",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
   "main": "index.js",