Compare commits

..

No commits in common. "ded53cd348bab2c5752d3c088a2f173cd1b9c578" and "0222664db88c9f107423e0399d401ddd367af086" have entirely different histories.

6 changed files with 25 additions and 31 deletions

View File

@ -30,11 +30,13 @@ NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
[Cloudflare.Pages](https://napneko.pages.dev/) [Cloudflare.Pages](https://napneko.pages.dev/)
[Server.China](https://napneko.com/)
[Server.Other](https://napcat.cyou/) [Server.Other](https://napcat.cyou/)
## 回家旅途 ## 回家旅途
[QQ Group](https://qm.qq.com/q/haLGHixZ74) [QQ Group](https://qm.qq.com/q/VfjAq5HIMS)
## 感谢他们 ## 感谢他们
感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权 感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权

View File

@ -4,7 +4,7 @@
"name": "NapCatQQ", "name": "NapCatQQ",
"slug": "NapCat.Framework", "slug": "NapCat.Framework",
"description": "高性能的 OneBot 11 协议实现", "description": "高性能的 OneBot 11 协议实现",
"version": "4.1.6", "version": "4.1.5",
"icon": "./logo.png", "icon": "./logo.png",
"authors": [ "authors": [
{ {

View File

@ -2,7 +2,7 @@
"name": "napcat", "name": "napcat",
"private": true, "private": true,
"type": "module", "type": "module",
"version": "4.1.6", "version": "4.1.5",
"scripts": { "scripts": {
"build:framework": "npm run build:webui && vite build --mode framework", "build:framework": "npm run build:webui && vite build --mode framework",
"build:shell": "npm run build:webui && vite build --mode shell", "build:shell": "npm run build:webui && vite build --mode shell",

View File

@ -234,10 +234,9 @@ export class NTEventWrapper {
this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallback); this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallback);
this.createListenerFunction(ListenerMainName); this.createListenerFunction(ListenerMainName);
let eventResult = this.createEventFunction(serviceAndMethod)!(...(args)); this.createEventFunction(serviceAndMethod)!(...(args))
.then((eventResult: any) => {
const eventRetHandle = (eventData: any) => { retEvent = eventResult;
retEvent = eventData;
if (!checkerEvent(retEvent) && timeoutRef.hasRef()) { if (!checkerEvent(retEvent) && timeoutRef.hasRef()) {
clearTimeout(timeoutRef); clearTimeout(timeoutRef);
reject( reject(
@ -252,15 +251,8 @@ export class NTEventWrapper {
), ),
); );
} }
}
if (eventResult instanceof Promise) {
eventResult.then((eventResult: any) => {
eventRetHandle(eventResult);
}) })
.catch(reject); .catch(reject);
} else {
eventRetHandle(eventResult);
}
}, },
); );
} }

View File

@ -1 +1 @@
export const napCatVersion = '4.1.6'; export const napCatVersion = '4.1.5';

View File

@ -28,7 +28,7 @@ export class GetGroupRootFiles extends BaseAction<Payload, {
startIndex: 0, startIndex: 0,
sortOrder: 2, sortOrder: 2,
showOnlinedocFolder: 0, showOnlinedocFolder: 0,
}); }).catch(() => []);
return { return {
files: ret.filter(item => item.fileInfo) files: ret.filter(item => item.fileInfo)