oicq-icalingua-plus-plus 1.22.2 → 1.22.5

package/README.md

@@ -1,8 +1,8 @@
 # oicq-icalingua-plus-plus
 
-[![npm version](https://img.shields.io/npm/v/oicq-plus-plus.svg?logo=npm)](https://www.npmjs.com/package/oicq-plus-plus)
-[![dm](https://shields.io/npm/dm/oicq-plus-plus)](https://www.npmjs.com/package/oicq-plus-plus)
-[![node engine](https://img.shields.io/node/v/oicq-plus-plus.svg)](https://nodejs.org)
+[![npm version](https://img.shields.io/npm/v/oicq-icalingua-plus-plus.svg?logo=npm)](https://www.npmjs.com/package/oicq-icalingua-plus-plus)
+[![dm](https://shields.io/npm/dm/oicq-icalingua-plus-plus)](https://www.npmjs.com/package/oicq-icalingua-plus-plus)
+[![node engine](https://img.shields.io/node/v/oicq-icalingua-plus-plus.svg)](https://nodejs.org)
 [![discord](https://img.shields.io/static/v1?label=chat&message=on%20discord&color=7289da&logo=discord)](https://discord.gg/gKnU7BARzv)
 
 * 由於 [oicq](https://github.com/takayama-lily/oicq) 發布 v2 並停止對oicq v1 的維護，而~~我們比較懶（bushi）~~，先搞個 v1 的分支湊合用下（

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/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]);
@@ -751,6 +755,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.2",
-  "app_version": "1.22.2",
-  "upday": "2022/05/04",
+  "version": "1.22.5",
+  "app_version": "1.22.4",
+  "upday": "2022/06/04",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
   "main": "index.js",