oicq-icalingua-plus-plus 1.22.3 → 1.22.6

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-net.js

@@ -103,7 +103,7 @@ class Network extends net.Socket {
         body = tea.encrypt(body, key);
         return await new Promise((resolve, reject) => {
             const id = setTimeout(reject, 5000);
-            https.request("https://configsvr.msf.3g.qq.com/configsvr/serverlist.jsp", { method: "POST" }, (res) => {
+            https.request("https://configsvr.msf.3g.qq.com/configsvr/serverlist.jsp?mType=getssolist", { method: "POST" }, (res) => {
                 let data = [];
                 res.on("error", reject);
                 res.on("data", (chunk) => data.push(chunk));

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/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/multi.js

@@ -132,7 +132,7 @@ async function makeForwardMsg(iterable, dm = false, target = 0) {
                     1: !target ? this.uin : target,
                     4: fake.nickname,
                 },
-                14: fake.nickname,
+                14: dm ? fake.nickname : null,
                 20: {
                     1: 0,
                     2: random

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];
@@ -751,6 +764,9 @@ async function parseForwardMsg(resid) {
         let user_id = head[1], nickname = "unknown", group_id;
         if (head[14]) {
             nickname = String(head[14]);
+            try {
+                group_id = head[9][1];
+            } catch { }
         } else {
             try {
                 nickname = String(head[9][4]);

package/lib/message/ptt.js

@@ -194,6 +194,7 @@ async function _uploadPtt(target, buf) {
     });
     const blob = await this.sendUni("PttStore.GroupPttUp", body);
     const rsp = pb.decode(blob)[5];
+    rsp[2] && drop(rsp[2], rsp[3]);
     if (!rsp[4]) {
         const ip = Array.isArray(rsp[5]) ? rsp[5][0] : rsp[5],
             port = Array.isArray(rsp[6]) ? rsp[6][0] : rsp[6];

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.22.3",
-  "app_version": "1.22.3",
-  "upday": "2022/05/04",
+  "version": "1.22.6",
+  "app_version": "1.22.6",
+  "upday": "2022/06/17",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
   "main": "index.js",