GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-11-21 09:36:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: 1.6.8 - parse appid

Browse Source
This commit is contained in:
手瓜一十雪 2024-07-25 17:57:39 +08:00
parent 6b3343e1e4
commit 9dbbcf3872
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/src/apis/file.ts
View File

@ -145,26 +145,27 @@ export class NTQQFileApi {
}); });
}); });
} }
static async getImageUrl(element: { originImageUrl: any; md5HexStr?: any; fileUuid: any; }) {
static async getImageUrl(element: { originImageUrl: any; md5HexStr?: any; fileUuid: any; }, isPrivateImage: boolean) {
if (!element) { if (!element) {
return ''; return '';
} }
const url = element.originImageUrl; // 没有域名 const url: string = element.originImageUrl; // 没有域名
const md5HexStr = element.md5HexStr; const md5HexStr = element.md5HexStr;
const fileMd5 = element.md5HexStr; const fileMd5 = element.md5HexStr;
const fileUuid = element.fileUuid; const fileUuid = element.fileUuid;
if (url) { if (url) {
if (url.startsWith('/download')) { let UrlParse = new URL(IMAGE_HTTP_HOST + url);//临时解析拼接
if (url.includes('&rkey=')) { let imageAppid = UrlParse.searchParams.get('appid');
let isNewPic = imageAppid && ['1406', '1407'].includes(imageAppid);
if (isNewPic) {
let UrlRkey = UrlParse.searchParams.get('rkey');
if (UrlRkey) {
return IMAGE_HTTP_HOST_NT + url; return IMAGE_HTTP_HOST_NT + url;
} }
const rkeyData = await rkeyManager.getRkey(); const rkeyData = await rkeyManager.getRkey();
UrlRkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
const existsRKey = isPrivateImage ? rkeyData.private_rkey : rkeyData.group_rkey; return IMAGE_HTTP_HOST_NT + url + `${UrlRkey}`;
return IMAGE_HTTP_HOST_NT + url + `${existsRKey}`;
} else { } else {
// 老的图片url，不需要rkey // 老的图片url，不需要rkey
return IMAGE_HTTP_HOST + url; return IMAGE_HTTP_HOST + url;

2
src/onebot11/constructor.ts
View File

@ -170,7 +170,7 @@ export class OB11Constructor {
// let currentRKey = "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64" // let currentRKey = "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64"
try { try {
message_data['data']['url'] = await NTQQFileApi.getImageUrl(element.picElement, msg.chatType !== ChatType.group); message_data['data']['url'] = await NTQQFileApi.getImageUrl(element.picElement);
} catch (e: any) { } catch (e: any) {
logError('获取图片url失败', e.stack); logError('获取图片url失败', e.stack);
} }