Northern_Lights/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2026-02-06 21:10:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor AsyncQueue

Browse Source
This commit is contained in:
linyuchen
2024-05-01 16:03:53 +08:00
parent 84aa4ef9e2
commit 7484ef4f88
5 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/onebot11/action/group/GetGroupMemberInfo.ts
View File

@@ -18,7 +18,7 @@ class GetGroupMemberInfo extends BaseAction<PayloadType, OB11GroupMember> {
actionName = ActionName.GetGroupMemberInfo;
protected async _handle(payload: PayloadType) {
let WebGroupMember = await WebApi.getGroupMembers(payload.group_id.toString());
const WebGroupMember = await WebApi.getGroupMembers(payload.group_id.toString());
const member = await getGroupMember(payload.group_id.toString(), payload.user_id.toString());
// log(member);
if (member) {
@@ -30,7 +30,7 @@ class GetGroupMemberInfo extends BaseAction<PayloadType, OB11GroupMember> {
} catch (e) {
logDebug('获取群成员详细信息失败, 只能返回基础信息', e);
}
let retMember = OB11Constructor.groupMember(payload.group_id.toString(), member);
const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member);
for (let i = 0, len = WebGroupMember.length; i < len; i++) {
if (WebGroupMember[i]?.uin && WebGroupMember[i].uin === retMember.user_id) {
retMember.join_time = WebGroupMember[i]?.join_time;
@@ -42,7 +42,7 @@ class GetGroupMemberInfo extends BaseAction<PayloadType, OB11GroupMember> {
}
return retMember;
} else {
throw (`群成员${payload.user_id}不存在`);
throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
}
}
}

25
src/onebot11/constructor.ts
View File

@@ -44,8 +44,9 @@ import { deleteGroup, getFriend, getGroupMember, groupMembers, selfInfo, tempGro
import { NTQQFileApi, NTQQGroupApi, NTQQUserApi } from '../core/src/apis';
import http from 'http';
import { OB11GroupMsgEmojiLikeEvent } from '@/onebot11/event/notice/OB11MsgEmojiLikeEvent';
import { ImageQuene } from '@/common/utils/asyncQuene';
import { AsyncQueue } from '@/common/utils/AsyncQueue';
const imageQueue = new AsyncQueue();
export class OB11Constructor {
static async message(msg: RawMessage): Promise<OB11Message> {
@@ -144,18 +145,18 @@ export class OB11Constructor {
message_data['data']['file'] = element.picElement.fileName;
// message_data["data"]["path"] = element.picElement.sourcePath
// let currentRKey = "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64"
ImageQuene.addTask(NTQQFileApi.getImageUrl, [msg], (result: string) => {
message_data['data']['url'] = result;
await new Promise<void>((resolve, reject) => {
const task = new Promise<void>((taskResolve, taskReject) => {
log('开始获取图片url');
NTQQFileApi.getImageUrl(msg).then((url) => {
message_data['data']['url'] = url;
log('获取图片url结果:', url);
taskResolve();
resolve();
});
});
imageQueue.addTask(task);
});
await ImageQuene.runQueue();
// 缓解获取失败
try {
if (!message_data['data']['url']) {
message_data['data']['url'] = "";
}
} catch (e) {
message_data['data']['url'] = "";
}
// message_data["data"]["file_id"] = element.picElement.fileUuid
message_data['data']['file_size'] = element.picElement.fileSize;