oicq-icalingua-plus-plus 1.23.76 → 1.23.77

package/lib/message/image.js

@@ -536,14 +536,15 @@ async function uploadImages(target, imgs, c2c = false) {
  * 下载QQNT群图
  * @this {import("../ref").Client}
  * @param {number} group_id 
- * @param {import("../ref").Proto} elem 
+ * @param {number} fileid 
+ * @param {Buffer} fileMd5
  */
-async function groupNTPicDown(group_id, elem) {
+async function groupNTPicDown(group_id, fileid, fileMd5) {
     const req = {
         1: group_id,
         2: this.uin,
-        3: elem[7], //fileid
-        4: elem[13], //fileMd5
+        3: fileid, //fileid
+        4: fileMd5, //fileMd5
         5: 4, //urlFlag
         6: 32, //urlType
         7: 5, //reqTerm
@@ -567,13 +568,13 @@ async function groupNTPicDown(group_id, elem) {
  * 下载QQNT私聊图
  * @this {import("../ref").Client}
  * @param {number} user_id 
- * @param {import("../ref").Proto} elem 
+ * @param {string} fileResId 
  */
-async function offNTPicDown(user_id, elem) {
+async function offNTPicDown(user_id, fileResId) {
     const req = {
         1: user_id,
         2: this.uin,
-        3: elem[2], //fileResId
+        3: fileResId, //fileResId
         4: 4, //urlFlag
         6: 32, //urlType
         7: 5, //reqTerm

package/lib/message/parser.js

@@ -95,6 +95,7 @@ class Parser {
     message = [];
     raw_message = "";
     bubble_id = 0;
+    imgprefix = null;
 
     /**
      * @type {import("../ref").Anonymous}
@@ -448,6 +449,9 @@ class Parser {
                         await this.parseExclusiveElem(37, elem);
                     } else if (elem[1] === 20) { //json only for mobileqq
                         await this.parseExclusiveElem(51, elem[2]);
+                    } else if (elem[1] == 48) { //image prefix of qqnt
+                        if (elem[2] && elem[2][1] && elem[2][1][2] && elem[2][1][2][1] && elem[2][1][2][3])
+                            this.imgprefix = "https://" + String(elem[2][1][2][3]) + String(elem[2][1][2][1]);
                     }
                     break;
                 case 45: //reply
@@ -467,19 +471,47 @@ class Parser {
      */
     async parseImgElem(elem) {
         const data = { };
-        if (!elem[7]) { //QQNT私图
+        if (elem[29] && elem[29][30] && String(elem[29][30]).startsWith("&rkey=")) {
+            //QQNT 私图
+            if (this.imgprefix) {
+                data.file = buildImageFileParam(elem[7].toHex(), elem[2], elem[9], elem[8], elem[5]);
+                data.url = this.imgprefix + String(elem[29][30]) + "&spec=0";
+                this.imgprefix = null;
+                return data;
+            }
+        } else if (elem[34] && elem[34][30] && String(elem[34][30]).startsWith("&rkey=")) {
+            //QQNT 群图
+            if (this.imgprefix) {
+                data.file = buildImageFileParam(elem[13].toHex(), elem[25], elem[22], elem[23], elem[20]);
+                data.url = this.imgprefix + String(elem[34][30]) + "&spec=0";
+                this.imgprefix = null;
+                return data;
+            }
+        }
+        if (!elem[7]) { //QQNT 群聊转发到私聊图
             data.file = buildImageFileParam(elem[13].toHex(), elem[25], elem[22], elem[23], elem[20]);
-            data.url = await offNTPicDown.call(this.c, this.uid, elem);
+            data.url = await offNTPicDown.call(this.c, this.uid, elem[2]);
         } else if (elem[7].toHex) { //私图
             data.file = buildImageFileParam(elem[7].toHex(), elem[2], elem[9], elem[8], elem[5]);
-            if (elem[29] && elem[29][30])
-                data.url = "https://gchat.qpic.cn" + elem[29][30] + "&spec=0&rf=naio";
-            else if (elem[15])
+            if (elem[15])
                 data.url = "https://c2cpicdw.qpic.cn" + elem[15];
-            else if (elem[10])
-                data.url = `https://c2cpicdw.qpic.cn/offpic_new/${this.uid}/${elem[10]}/0?term=2`;
-            if (!data.url || !data.url.includes("offpic_new"))
-                data.url = await offNTPicDown.call(this.c, this.uid, elem);
+            else if (elem[10]) {
+                if (elem[23])
+                    data.url = await groupNTPicDown.call(this.c, this.gid, elem[23], elem[7]);
+                else
+                    data.url = await offNTPicDown.call(this.c, this.uid, elem[10]);
+            }
+            /* deprecated
+            if (!data.url || !data.url.includes("offpic_new")) {
+                const keys = Object.keys(elem).reverse();
+                for (let key of keys) {
+                    if (elem[key].toString || elem[key].toString().length !== 16) {
+                        data.url = await offNTPicDown.call(this.c, this.uid, String(elem[key]));
+                        break;
+                    }
+                }
+            }
+            */
         } else { //群图
             data.file = buildImageFileParam(elem[13].toHex(), elem[25], elem[22], elem[23], elem[20]);
             if (elem[16])

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.23.76",
-  "app_version": "1.23.76",
+  "version": "1.23.77",
+  "app_version": "1.23.77",
   "upday": "2023/09/22",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",