GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2025-07-19 12:03:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修复大部分逻辑

Browse Source
This commit is contained in:
手瓜一十雪
2024-11-16 11:25:16 +08:00
parent 34e96b1089
commit 8981f12b1a
6 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/onebot/config/config.ts
View File

@@ -42,7 +42,6 @@ export const httpServerDefaultConfigs = createDefaultAdapterConfig({
enableCors: true,
enableWebsocket: true,
messagePostFormat: 'array',
reportSelfMessage: false,
token: '',
debug: false,
});
@@ -63,13 +62,13 @@ export const websocketServerDefaultConfigs = createDefaultAdapterConfig({
name: 'websocket-server',
enable: false as boolean,
host: '0.0.0.0',
port: 3002,
port: 3001,
messagePostFormat: 'array',
reportSelfMessage: false,
token: '',
enablePushEvent: true,
debug: false,
heartInterval: 0,
heartInterval: 30000,
});
export type WebsocketServerConfig = typeof websocketServerDefaultConfigs;
@@ -81,7 +80,7 @@ export const websocketClientDefaultConfigs = createDefaultAdapterConfig({
reportSelfMessage: false,
token: '',
debug: false,
heartInterval: 0,
heartInterval: 30000,
});
export type WebsocketClientConfig = typeof websocketClientDefaultConfigs;
@@ -166,7 +165,6 @@ export function migrateOneBotConfigsV1(config: Partial<v1Config>): OneBotConfig
token: config.http.secret,
debug: config.debug,
messagePostFormat: config.messagePostFormat,
reportSelfMessage: config.reportSelfMessage,
}),
];
}

2
src/onebot/index.ts
View File

@@ -616,7 +616,7 @@ export class NapCatOneBot11Adapter {
} else if (ob11Msg.stringMsg.message.length === 0 || ob11Msg.arrayMsg.message.length == 0) {
return;
}
const notreportSelf_network = network.flat().filter((e) => e.enable && !e.reportSelfMessage);
const notreportSelf_network = network.flat().filter((e) => e.enable && (('reportSelfMessage' in e && !e.reportSelfMessage) || !('reportSelfMessage' in e)));
if (isSelfMsg) {
for (const adapter of notreportSelf_network) {
msgMap.delete(adapter.name);