oicq-icalingua-plus-plus 1.22.1 → 1.22.4

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/index.d.ts

@@ -975,7 +975,7 @@ export class Client extends EventEmitter {
      * 制作一个合并转发消息，得到的XmlElem可直接发送
      * @param dm 默认(false)以群模式上传图片，设为true则以私聊模式上传图片
      */
-    makeForwardMsg(fakes: FakeMessage | Iterable<FakeMessage>, dm?: boolean): Promise<Ret<XmlElem>>;
+    makeForwardMsg(fakes: FakeMessage | Iterable<FakeMessage>, dm?: boolean, target?: number): Promise<Ret<XmlElem>>;
 
     /** 发简易群公告 */
     sendGroupNotice(group_id: number, content: string): Promise<Ret>;

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

@@ -375,7 +375,7 @@ class Client extends EventEmitter {
     getForwardMsg(id) {
         return this._useProtocol(chat.getForwardMsg, arguments);
     }
-    makeForwardMsg(fakes, dm = false) {
+    makeForwardMsg(fakes, dm = false, target = 0) {
         return this._useProtocol(multi.makeForwardMsg, arguments);
     }
 

package/lib/device.js

@@ -129,31 +129,31 @@ const apk = {
     //android phone
     1: {
         id: "com.tencent.mobileqq",
-        name: "A8.4.1.2703aac4",
-        version: "8.4.1.2703",
-        ver: "8.4.1",
+        name: "A8.8.80.7400",
+        version: "8.8.80.7400",
+        ver: "8.8.80",
         sign: Buffer.from([166, 183, 69, 191, 36, 162, 194, 119, 82, 119, 22, 246, 243, 110, 182, 141]),
-        buildtime: 1591690260,
+        buildtime: 1640921786,
         appid: 16,
-        subid: 537064989,
+        subid: 537113159,
         bitmap: 184024956,
         sigmap: 34869472,
-        sdkver: "6.0.0.2428",
+        sdkver: "6.0.0.2494",
     },
 
     //apad
     2: {
         id: "com.tencent.minihd.qq",
-        name: "A5.8.9.3460",
-        version: "5.8.9.3460",
-        ver: "5.8.9",
+        name: "A5.9.3.3468",
+        version: "5.9.3.3468",
+        ver: "5.9.3",
         sign: Buffer.from([170, 57, 120, 244, 31, 217, 111, 249, 145, 74, 102, 158, 24, 100, 116, 199]),
-        buildtime: 1595836208,
+        buildtime: 1637427966,
         appid: 16,
-        subid: 537065549,
+        subid: 537067382,
         bitmap: 150470524,
         sigmap: 1970400,
-        sdkver: "6.0.0.2433",
+        sdkver: "6.0.0.2487",
     }
 };
 

package/lib/message/multi.js

@@ -51,7 +51,7 @@ function buildFaceElem(id) {
  * @this {import("../ref").Client}
  * @param {import("../ref").FakeMessage[]} iterable 
  */
-async function makeForwardMsg(iterable, dm = false) {
+async function makeForwardMsg(iterable, dm = false, target = 0) {
 
     if (typeof iterable[Symbol.iterator] !== "function")
         iterable = [iterable];
@@ -122,17 +122,17 @@ async function makeForwardMsg(iterable, dm = false) {
         nodes.push({
             1: {
                 1: fake.user_id,
-                2: this.uin,
+                2: !target ? this.uin : target,
                 3: dm ? 166 : 82,
                 4: dm ? 11 : null,
                 5: seq,
                 6: fake.time || common.timestamp(),
                 7: common.genMessageUuid(random),
                 9: dm ? null : {
-                    1: this.uin,
+                    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

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