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

Merge remote-tracking branch 'fork/refactor/proto' into refactor/proto

Browse Source
This commit is contained in:
pk5ls20 2024-10-13 17:23:32 +08:00
commit b807b89cdc
No known key found for this signature in database
GPG Key ID: 6370ED7A169F493A
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ export class NTQQFileApi {
context: InstanceContext; context: InstanceContext;
core: NapCatCore; core: NapCatCore;
rkeyManager: RkeyManager; rkeyManager: RkeyManager;
packetRkey: Array<{ rkey: string; time: number; type: number; }> | undefined;
constructor(context: InstanceContext, core: NapCatCore) { constructor(context: InstanceContext, core: NapCatCore) {
this.context = context; this.context = context;
@ -375,14 +376,21 @@ export class NTQQFileApi {
group_rkey: 'CAQSKAB6JWENi5LM_xp9vumLbuThJSaYf-yzMrbZsuq7Uz2qffcqm614gds', group_rkey: 'CAQSKAB6JWENi5LM_xp9vumLbuThJSaYf-yzMrbZsuq7Uz2qffcqm614gds',
online_rkey: false online_rkey: false
}; };
if (this.core.apis.PacketApi.PacketClient?.isConnected) { try {
let rkeylist = await this.core.apis.PacketApi.sendRkeyPacket(); if (this.core.apis.PacketApi.PacketClient?.isConnected) {
if (rkeylist.length > 0) { if ((!this.packetRkey || this.packetRkey[0].time < Date.now() / 1000)) {
rkeyData.group_rkey = rkeylist[0].rkey; this.packetRkey = await this.core.apis.PacketApi.sendRkeyPacket();
rkeyData.private_rkey = rkeylist[1].rkey; }
rkeyData.online_rkey = true; if (this.packetRkey.length > 0) {
rkeyData.group_rkey = this.packetRkey[1].rkey;
rkeyData.private_rkey = this.packetRkey[0].rkey;
rkeyData.online_rkey = true;
}
} }
} catch (error) {
} }
if (!rkeyData.online_rkey) { if (!rkeyData.online_rkey) {
try { try {
let tempRkeyData = await this.rkeyManager.getRkey(); let tempRkeyData = await this.rkeyManager.getRkey();