chore: ver 3.20.5

manifest.json

@@ -1,10 +1,10 @@
 {
   "manifest_version": 4,
   "type": "extension",
-  "name": "LLOneBot v3.20.2",
+  "name": "LLOneBot v3.20.5",
   "slug": "LLOneBot",
   "description": "使你的NTQQ支持OneBot11协议进行QQ机器人开发, 不支持商店在线更新",
-  "version": "3.20.2",
+  "version": "3.20.5",
   "icon": "./icon.jpg",
   "authors": [
     {

src/main/main.ts

@@ -354,8 +354,9 @@ function onLoad() {
 
         registerReceiveHook<FriendRequestNotify>(ReceiveCmdS.FRIEND_REQUEST, async (payload) => {
             for (const req of payload.data.buddyReqs) {
-                if (req.isUnread && !friendRequests[req.sourceId] && (parseInt(req.reqTime) > startTime / 1000)) {
+                let flag = req.friendUid + req.reqTime;
-                    friendRequests[req.sourceId] = req;
+                if (req.isUnread && (parseInt(req.reqTime) > startTime / 1000)) {
+                    friendRequests[flag] = req;
                     log("有新的好友请求", req);
                     let friendRequestEvent = new OB11FriendRequestEvent();
                     try {
@@ -364,7 +365,7 @@ function onLoad() {
                     } catch (e) {
                         log("获取加好友者QQ号失败", e);
                     }
-                    friendRequestEvent.flag = req.sourceId.toString();
+                    friendRequestEvent.flag = flag;
                     friendRequestEvent.comment = req.extWords;
                     postOB11Event(friendRequestEvent);
                 }

src/ntqqapi/api/friend.ts

@@ -37,10 +37,10 @@ export class NTQQFriendApi{
             }, null]
         })
     }
-    static async handleFriendRequest(sourceId: number, accept: boolean,) {
+    static async handleFriendRequest(flag: string, accept: boolean,) {
-        const request: FriendRequest = friendRequests[sourceId]
+        const request: FriendRequest = friendRequests[flag]
         if (!request) {
-            throw `sourceId ${sourceId}, 对应的好友请求不存在`
+            throw `flat: ${flag}, 对应的好友请求不存在`
         }
         const result = await callNTQQApi<GeneralCallResult>({
             methodName: NTQQApiMethod.HANDLE_FRIEND_REQUEST,
@@ -54,7 +54,7 @@ export class NTQQFriendApi{
                 }
             ]
         })
-        delete friendRequests[sourceId];
+        delete friendRequests[flag];
         return result;
     }
 

src/ntqqapi/constructor.ts

@@ -63,7 +63,7 @@ export class SendMsgElementConstructor {
     }
 
     static async pic(picPath: string, summary: string = "", subType: 0|1=0): Promise<SendPicElement> {
-        const {md5, fileName, path, fileSize, ext} = await NTQQFileApi.uploadFile(picPath, ElementType.PIC, subType);
+        const {md5, fileName, path, fileSize} = await NTQQFileApi.uploadFile(picPath, ElementType.PIC, subType);
         if (fileSize === 0) {
             throw "文件异常，大小为0";
         }
@@ -73,7 +73,7 @@ export class SendMsgElementConstructor {
             fileSize: fileSize.toString(),
             picWidth: imageSize.width,
             picHeight: imageSize.height,
-            fileName: md5 + ext,
+            fileName: fileName,
             sourcePath: path,
             original: true,
             picType: isGIF(picPath) ? PicType.gif : PicType.jpg,

src/onebot11/action/user/SetFriendAddRequest.ts

@@ -13,7 +13,7 @@ export default class SetFriendAddRequest extends BaseAction<Payload, null> {
 
     protected async _handle(payload: Payload): Promise<null> {
         const approve = payload.approve.toString() === "true";
-        await NTQQFriendApi.handleFriendRequest(parseInt(payload.flag), approve)
+        await NTQQFriendApi.handleFriendRequest(payload.flag, approve)
         return null;
     }
 }

src/onebot11/constructor.ts

@@ -40,11 +40,12 @@ import {OB11GroupTitleEvent} from "./event/notice/OB11GroupTitleEvent";
 import {OB11GroupCardEvent} from "./event/notice/OB11GroupCardEvent";
 import {OB11GroupDecreaseEvent} from "./event/notice/OB11GroupDecreaseEvent";
 
+let lastRKeyUpdateTime = 0;
 
 export class OB11Constructor {
     static async message(msg: RawMessage): Promise<OB11Message> {
         let config = getConfigUtil().getConfig();
-        const {enableLocalFile2Url, ob11: {messagePostFormat}} = getConfigUtil().getConfig()
+        const {enableLocalFile2Url, ob11: {messagePostFormat}} = config;
         const message_type = msg.chatType == ChatType.group ? "group" : "private";
         const resMsg: OB11Message = {
             self_id: parseInt(selfInfo.uin),
@@ -140,21 +141,27 @@ export class OB11Constructor {
                 // message_data["data"]["path"] = element.picElement.sourcePath
                 const url = element.picElement.originImageUrl
                 const fileMd5 = element.picElement.md5HexStr
-                let currentRKey = config.imageRKey || "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64"
+                const fileUuid = element.picElement.fileUuid
+                // let currentRKey = config.imageRKey || "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64"
+                let currentRKey = "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64"
                 if (url) {
                     if (url.startsWith("/download")) {
                         if (url.includes("&rkey=")) {
                             // 正则提取rkey
-                            const rkey = url.match(/&rkey=([^&]+)/)[1]
+                            // const rkey = url.match(/&rkey=([^&]+)/)[1]
-                            // log("图片url已有rkey", rkey)
+                            // // log("图片url已有rkey", rkey)
-                            if (rkey != currentRKey){
+                            // if (rkey != currentRKey){
-                                config.imageRKey = rkey
+                            //     config.imageRKey = rkey
-                                getConfigUtil().setConfig(config)
+                            //     if (Date.now() - lastRKeyUpdateTime > 1000 * 60) {
-                            }
+                            //         lastRKeyUpdateTime = Date.now()
-                            message_data["data"]["url"] = IMAGE_HTTP_HOST_NT + url
+                            //         getConfigUtil().setConfig(config)
+                            //     }
+                            // }
+                            message_data["data"]["url"] = IMAGE_HTTP_HOST + url
                         }
                         else{
-                            message_data["data"]["url"] = IMAGE_HTTP_HOST_NT + url + "&rkey=" + currentRKey
+                            // 有可能会碰到appid为1406的，这个不能使用新的NT域名，并且需要把appid改为1407才可访问
+                            message_data["data"]["url"] = `${IMAGE_HTTP_HOST}/download?appid=1407&fileid=${fileUuid}&rkey=${currentRKey}&spec=0`
                         }
                     } else {
                         message_data["data"]["url"] = IMAGE_HTTP_HOST + url

src/version.ts

@@ -1 +1 @@
-export const version = "3.20.2"
+export const version = "3.20.5"