QQ/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-09-28 04:05:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 玄学的问题

Browse Source
This commit is contained in:
手瓜一十雪 2024-06-04 12:20:42 +08:00
parent 42c85224ba
commit d40230879c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changelogs/CHANGELOG.v1.5.1.md
View File

@ -4,7 +4,7 @@ QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
## 修复与优化
* 支持 新Api: set_self_profile 可设置个性签名
* 修复 Api: get_group_system_msg
## 新增与调整

10
src/common/utils/EventTask.ts
View File

@ -112,14 +112,13 @@ export class NTEventWrapper {
return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(async (resolve, reject) => {
const id = randomUUID();
let complete = 0;
let retData: ArrayLike<Parameters<ListenerType>> | undefined = undefined;
let retData: Parameters<ListenerType> | undefined = undefined;
let retEvent: any = {};
const databack = () => {
if (complete < waitTimes) {
reject(new Error('NTEvent EventName:' + EventName + ' ListenerName:' + ListenerName + ' timeout'));
} else {
resolve([retEvent as Awaited<ReturnType<EventType>>, ...(retData as Parameters<ListenerType>)]);
resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
}
};
const Timeouter = setTimeout(databack, timeout);
@ -133,7 +132,7 @@ export class NTEventWrapper {
func: (...args: any[]) => {
complete++;
//console.log('func', ...args);
retData = args as ArrayLike<Parameters<ListenerType>>;
retData = args as Parameters<ListenerType>;
if (complete >= waitTimes) {
clearTimeout(Timeouter);
databack();
@ -149,7 +148,8 @@ export class NTEventWrapper {
this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
this.CreatListenerFunction(ListenerMainName);
const EventFunc = this.CreatEventFunction<EventType>(EventName);
retEvent = await EventFunc!(...args);
//console.log("测试打点", args);
retEvent = await EventFunc!(...(args as any[]));
});
}
}

2
src/onebot11/action/group/GetGroupSystemMsg.ts
View File

@ -8,7 +8,7 @@ import { uid2UinMap } from '@/core/data';
const SchemaData = {
type: 'object',
properties: {
group_id: { type: [ 'number' , 'string' ] }
group_id: { type: ['number', 'string'] }
},
} as const satisfies JSONSchema;