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

chore: 兼容wt

Browse Source
This commit is contained in:
手瓜一十雪 2024-07-31 14:21:05 +08:00
parent 0f8af273ae
commit 26b4a9b15b
2 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/utils/version.ts
View File

@ -4,10 +4,10 @@ export async function checkVersion(): Promise<string> {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
const MirrorList = const MirrorList =
[ [
'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json',
'https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json', 'https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
'https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json', 'https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
'https://cdn.jsdelivr.us/gh/NapNeko/NapCatQQ@main/package.json', 'https://cdn.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json'
'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json'
]; ];
let version = undefined; let version = undefined;
for (const url of MirrorList) { for (const url of MirrorList) {

52
src/core/src/apis/msg.ts
View File

@ -8,7 +8,8 @@ import { GeneralCallResult } from '@/core/services/common';
import { MessageUnique } from '../../../common/utils/MessageUnique'; import { MessageUnique } from '../../../common/utils/MessageUnique';
import { NTEventDispatch } from '@/common/utils/EventTask'; import { NTEventDispatch } from '@/common/utils/EventTask';
import { logNotice } from '@/onebot11/log'; import { logNotice } from '@/onebot11/log';
let MsgSendMode = 2; import { c } from 'vite/dist/node/types.d-aGj9QkWt';
//let MsgSendMode = 2;
async function LoadMessageIdList(Peer: Peer, msgId: string) { async function LoadMessageIdList(Peer: Peer, msgId: string) {
let msgList = await NTQQMsgApi.getMsgHistory(Peer, msgId, 50); let msgList = await NTQQMsgApi.getMsgHistory(Peer, msgId, 50);
@ -42,7 +43,7 @@ async function loadMessageUnique() {
setTimeout(() => { setTimeout(() => {
napCatCore.onLoginSuccess(async () => { napCatCore.onLoginSuccess(async () => {
await sleep(100); await sleep(100);
NTQQMsgApi.CheckSendMode().then().catch(); // NTQQMsgApi.CheckSendMode().then().catch();
loadMessageUnique().then().catch(); loadMessageUnique().then().catch();
}); });
}, 100); }, 100);
@ -65,25 +66,25 @@ setTimeout(() => {
// console.log(await NTQQMsgApi.multiForwardMsg(peer, peer, [MsgId])); // console.log(await NTQQMsgApi.multiForwardMsg(peer, peer, [MsgId]));
// }, 25000) // }, 25000)
export class NTQQMsgApi { export class NTQQMsgApi {
static async CheckSendMode() { // static async CheckSendMode() {
try { // try {
NTQQMsgApi.sendMsgV2({ chatType: 1, peerUid: selfInfo.uid }, [SendMsgElementConstructor.text('消息队列模式测试')], true, 10000).then().catch(); // NTQQMsgApi.sendMsgV2({ chatType: 1, peerUid: selfInfo.uid }, [SendMsgElementConstructor.text('消息队列模式测试')], true, 10000).then().catch();
MsgSendMode = 2; // MsgSendMode = 2;
logNotice('[消息队列] 消息模式确认: MsgId异步队列'); // logNotice('[消息队列] 消息模式确认: MsgId异步队列');
return true; // return true;
} catch (error) { // } catch (error) {
logNotice('[消息队列] 消息模式失败: MsgId异步队列'); // logNotice('[消息队列] 消息模式失败: MsgId异步队列');
} // }
try { // try {
NTQQMsgApi.sendMsgV1({ chatType: 1, peerUid: selfInfo.uid }, [SendMsgElementConstructor.text('消息队列模式测试')], true, 10000).then().catch(); // NTQQMsgApi.sendMsgV1({ chatType: 1, peerUid: selfInfo.uid }, [SendMsgElementConstructor.text('消息队列模式测试')], true, 10000).then().catch();
MsgSendMode = 1; // MsgSendMode = 1;
logNotice('[消息队列] 消息模式确认: MsgSeq异步队列'); // logNotice('[消息队列] 消息模式确认: MsgSeq异步队列');
return true; // return true;
} catch (error) { // } catch (error) {
logNotice('[消息队列] 消息模式失败: MsgSeq异步队列'); // logNotice('[消息队列] 消息模式失败: MsgSeq异步队列');
} // }
return false; // return false;
} // }
// static napCatCore: NapCatCore | null = null; // static napCatCore: NapCatCore | null = null;
// enum BaseEmojiType { // enum BaseEmojiType {
// NORMAL_EMOJI, // NORMAL_EMOJI,
@ -215,12 +216,8 @@ export class NTQQMsgApi {
return retMsg; return retMsg;
} }
static sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) { static sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
if (MsgSendMode == 1) { console.log("sendMsg", peer, msgElements, waitComplete, timeout);
return NTQQMsgApi.sendMsgV1(peer, msgElements, waitComplete, timeout); return NTQQMsgApi.sendMsgV1(peer, msgElements, waitComplete, timeout);
} else if (MsgSendMode == 2) {
return NTQQMsgApi.sendMsgV2(peer, msgElements, waitComplete, timeout);
}
throw new Error('未知的发送消息模式');
} }
static async sendMsgV1(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) { static async sendMsgV1(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
let msgList = await NTQQMsgApi.getLastestMsgByUids(peer); let msgList = await NTQQMsgApi.getLastestMsgByUids(peer);
@ -247,7 +244,8 @@ export class NTQQMsgApi {
} }
return false; return false;
}).catch(logError); }).catch(logError);
await NTEventDispatch.CallNoListenerEvent<NodeIKernelMsgService['sendMsg']>('NodeIKernelMsgService/sendMsg', timeout, "0", peer, msgElements, new Map()); await napCatCore.session.getMsgService().sendMsg("0", peer, msgElements, new Map());
//await NTEventDispatch.CallNoListenerEvent<NodeIKernelMsgService['sendMsg']>('NodeIKernelMsgService/sendMsg', timeout, "0", peer, msgElements, new Map());
await EventListener; await EventListener;
await EventListener2; await EventListener2;
// console.log("rawMsg", JSON.stringify(rawMsg, null, 4)); // console.log("rawMsg", JSON.stringify(rawMsg, null, 4));