Northern_Lights/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2026-02-11 15:30:25 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'main' into extend

Browse Source
This commit is contained in:
手瓜一十雪
2024-08-19 20:44:49 +08:00
parent 8f468c693e c9cab89091
commit ea7f297e8e
10 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/framework/napcat.ts
View File

@@ -2,7 +2,7 @@ import path, { dirname } from 'path';
import { fileURLToPath } from 'url';
import fs from 'fs';
export const napcat_version = '2.0.33';
export const napcat_version = '2.0.34';
export class NapCatPathWrapper {
binaryPath: string;

4
src/onebot/action/msg/SendMsg/create-send-elements.ts
View File

@@ -56,7 +56,7 @@ const _handlers: {
if (atQQ === 'all') return SendMsgElementConstructor.at(coreContext, atQQ, atQQ, AtType.atAll, '全体成员');
// then the qq is a group member
// Mlikiowa V2.0.33 Refactor Todo
// Mlikiowa V2.0.34 Refactor Todo
const uid = await coreContext.apis.UserApi.getUidByUinV2(`${atQQ}`);
if (!uid) throw new Error('Get Uid Error');
return SendMsgElementConstructor.at(coreContext, atQQ, uid, AtType.atUser, '');
@@ -161,7 +161,7 @@ const _handlers: {
} else {
postData = data;
}
// Mlikiowa V2.0.33 Refactor Todo
// Mlikiowa V2.0.34 Refactor Todo
const signUrl = obContext.configLoader.configData.musicSignUrl;
if (!signUrl) {
if (data.type === 'qq') {

2
src/onebot/helper/data.ts
View File

@@ -419,7 +419,7 @@ export class OB11Constructor {
return;
}
//log("group msg", msg);
// Mlikiowa V2.0.33 Refactor Todo
// Mlikiowa V2.0.34 Refactor Todo
// if (msg.senderUin && msg.senderUin !== '0') {
// const member = await getGroupMember(msg.peerUid, msg.senderUin);
// if (member && member.cardName !== msg.sendMemberName) {

6
src/onebot/network/active-websocket.ts
View File

@@ -79,6 +79,12 @@ export class OB11ActiveWebSocketAdapter implements IOB11NetworkAdapter {
},
});
this.connection.on('ping', () => {
this.connection?.pong();
});
this.connection.on('pong', () => {
//this.logger.logDebug('[OneBot] [WebSocket Client] 收到pong');
});
this.connection.on('open', () => {
try {
this.connectEvent(this.coreContext);

6
src/onebot/network/passive-websocket.ts
View File

@@ -50,6 +50,12 @@ export class OB11PassiveWebSocketAdapter implements IOB11NetworkAdapter {
wsClient.on('message', (message) => {
this.handleMessage(wsClient, message).then().catch(this.logger.logError);
});
wsClient.on('ping', () => {
wsClient.pong();
});
wsClient.on('pong', () => {
//this.logger.logDebug('[OneBot] [WebSocket Server] Pong received');
});
wsClient.once('close', () => {
this.wsClientsMutex.runExclusive(async () => {
const index = this.wsClients.indexOf(wsClient);

2
src/webui/ui/NapCat.ts
View File

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
SettingItem(
'<span id="napcat-update-title">Napcat</span>',
undefined,
SettingButton('V2.0.33', 'napcat-update-button', 'secondary'),
SettingButton('V2.0.34', 'napcat-update-button', 'secondary'),
),
]),
SettingList([