oicq-icalingua-plus-plus 1.24.2 → 1.24.4

package/lib/client-ext.js

@@ -352,7 +352,7 @@ Client.prototype.pbGetMsg = async function () {
 
 function sleep(time) {
     return new Promise(resolve => setTimeout(resolve, time));
-  } 
+} 
 
 /**
  * 注册qsign

package/lib/client.js

@@ -21,6 +21,7 @@ const nessy = require("./core/nessy");
 const { WtLogin } = require("./wtlogin/wt");
 const chat = require("./message/chat");
 const multi = require("./message/multi");
+const image = require("./message/image");
 const { Gfs } = require("./message/file");
 const { getErrorMessage, TimeoutError } = require("./exception");
 
@@ -619,6 +620,14 @@ class Client extends EventEmitter {
         return this._useProtocol(chat.preloadImages, arguments);
     }
 
+    getGroupNTPicRkey() {
+        return this._useProtocol(image.getGroupNTPicRkey, arguments);
+    }
+
+    getOffNTPicRkey() {
+        return this._useProtocol(image.getOffNTPicRkey, arguments);
+    }
+
     ///////////////////////////////////////////////////
 
     async getCookies(domain) {

package/lib/message/face.js

@@ -287,6 +287,11 @@ const map = {
     357: "/裂开",
     358: "/骰子",
     359: "/包剪锤",
+
+    392: "/龙年快乐",
+    393: "/新年中龙",
+    394: "/新年大龙",
+    395: "/略略略",
 };
 
 const FACE_OLD_BUF = Buffer.from([0x00, 0x01, 0x00, 0x04, 0x52, 0xCC, 0xF5, 0xD0]);

package/lib/message/image.js

@@ -611,7 +611,7 @@ async function checkImgUrl(url) {
 /**
  * 获取QQNT私聊图URL
  * @this {import("../ref").Client}
- * @param {Buffer} imgInfo 
+ * @param {Object} imgInfo 
  * @param {String} uid
  */
 async function getOffNTPicURL(imgInfo, uid = String(this.uid || this.uin)) {
@@ -659,7 +659,7 @@ async function getOffNTPicURL(imgInfo, uid = String(this.uid || this.uin)) {
 /**
  * 获取QQNT群图URL
  * @this {import("../ref").Client}
- * @param {Buffer} imgInfo 
+ * @param {Object} imgInfo 
  * @param {number} gid
  */
 async function getGroupNTPicURL(imgInfo, gid = 284840486) {
@@ -692,7 +692,7 @@ async function getGroupNTPicURL(imgInfo, gid = 284840486) {
         },
     });
     try {
-        const rsp = await this.sendOidbSvcTrpcTcp("OidbSvcTrpcTcp.0x11c5_200", body);
+        const rsp = await this.sendOidbSvcTrpcTcp("OidbSvcTrpcTcp.0x11c4_200", body);
         const rkey = rsp[3][1];
         if (!rkey)
             throw new Error("rkey不存在");
@@ -703,8 +703,31 @@ async function getGroupNTPicURL(imgInfo, gid = 284840486) {
     }
 }
 
+/**
+ * 获取QQNT群图rkey
+ * @this {import("../ref").Client}
+ */
+async function getGroupNTPicRkey() {
+    const rsp = await getGroupNTPicURL.call(this, {
+        3: 1,
+    });
+    return '&rkey=' + rsp.match(/&rkey=([^&]+)/)[1];
+}
+
+/**
+ * 获取QQNT私聊图rkey
+ * @this {import("../ref").Client}
+ */
+async function getOffNTPicRkey() {
+    const rsp = await getOffNTPicURL.call(this, {
+        3: 1,
+    });
+    return '&rkey=' + rsp.match(/&rkey=([^&]+)/)[1];
+}
+
 module.exports = {
     ImageBuilder, uploadImages, buildImageFileParam,
     groupNTPicDown, offNTPicDown, checkImgUrl,
     getGroupNTPicURL, getOffNTPicURL,
+    getGroupNTPicRkey, getOffNTPicRkey,
 };

package/lib/message/parser.js

@@ -368,12 +368,14 @@ class Parser {
             break;
         case 46: //markdown button
             break;
-        case 48: //image of qqnt
-            const imgData = await this.parseNTImgElem(type, elem);
+        case 48: //ntv2richmedia
+            const imgData = await this.parseNTImgElem(type, elem[2], elem[3]);
             if (imgData) {
                 msg.type = "image";
                 msg.data = imgData;
                 brief = "[图片]";
+            } else {
+                return;
             }
             break;
         default:
@@ -464,8 +466,8 @@ 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
-                        await this.parsePartialElem(48, elem[2]);
+                    } else if (elem[1] == 48) { //ntv2richmedia
+                        await this.parsePartialElem(48, elem);
                         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]);
                     } else if (elem[1] == 45) { //markdown
@@ -487,13 +489,14 @@ class Parser {
      * @private
      * @param {number} type 48|3
      * @param {import("../ref").Proto} elem 
+     * @param {number} businessType
      */
-    async parseNTImgElem(type, elem) {
+    async parseNTImgElem(type, elem, businessType = 0) {
+        if (![0, 10, 20].includes(businessType)) return null;
         const data = { };
         if (!elem[2] || !elem[2][1]) return null;
-        const dm = !!elem[2][1][11];
-        const extra = dm ? elem[2][1][11] : elem[2][1][12];
-        if (!extra) return null;
+        const dm = businessType ? businessType === 10 : !!elem[2][1][11];
+        const extra = elem[2][1][11] || elem[2][1][12] || { 30: "" };
         const ntPath = String(extra[30] || "");
 
         const imgInfo = elem[1][1];

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.24.2",
-  "app_version": "1.24.2",
-  "upday": "2024/04/22",
+  "version": "1.24.4",
+  "app_version": "1.24.4",
+  "upday": "2024/04/24",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
   "main": "index.js",