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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
napcat.webui/src/pages/network/HttpClientComponent.vue
View File

@ -18,6 +18,9 @@
<t-form-item label="调试模式"> <t-form-item label="调试模式">
<t-checkbox v-model="config.debug" /> <t-checkbox v-model="config.debug" />
</t-form-item> </t-form-item>
<t-form-item label="启用">
<t-checkbox v-model="config.enable" />
</t-form-item>
</t-form> </t-form>
</div> </div>
</div> </div>

31
napcat.webui/src/pages/network/HttpServerComponent.vue
View File

@ -1,32 +1,35 @@
<template> <template>
<div class="container"> <div class="container">
<div class="form-container"> <div class="form-container">
<h3>HTTP Server 配置</h3> <h3>WebSocket Server 配置</h3>
<t-form> <t-form>
<t-form-item label="主机">
<t-input v-model="config.host" />
</t-form-item>
<t-form-item label="端口"> <t-form-item label="端口">
<t-input v-model.number="config.port" type="number" /> <t-input v-model.number="config.port" type="number" />
</t-form-item> </t-form-item>
<t-form-item label="主机">
<t-input v-model="config.host" type="text" />
</t-form-item>
<t-form-item label="启用 CORS">
<t-checkbox v-model="config.enableCors" />
</t-form-item>
<t-form-item label="启用 WS">
<t-checkbox v-model="config.enableWebsocket" />
</t-form-item>
<t-form-item label="消息格式"> <t-form-item label="消息格式">
<t-input v-model="config.messagePostFormat" type="text" /> <t-input v-model="config.messagePostFormat" />
</t-form-item> </t-form-item>
<t-form-item label="报告自身消息"> <t-form-item label="报告自身消息">
<t-checkbox v-model="config.reportSelfMessage" /> <t-checkbox v-model="config.reportSelfMessage" />
</t-form-item> </t-form-item>
<t-form-item label="Token"> <t-form-item label="Token">
<t-input v-model="config.token" type="text" /> <t-input v-model="config.token" />
</t-form-item>
<t-form-item label="启用推送事件">
<t-checkbox v-model="config.enablePushEvent" />
</t-form-item> </t-form-item>
<t-form-item label="调试模式"> <t-form-item label="调试模式">
<t-checkbox v-model="config.debug" /> <t-checkbox v-model="config.debug" />
</t-form-item> </t-form-item>
<t-form-item label="心跳间隔">
<t-input v-model.number="config.heartInterval" type="number" />
</t-form-item>
<t-form-item label="启用">
<t-checkbox v-model="config.enable" />
</t-form-item>
</t-form> </t-form>
</div> </div>
</div> </div>
@ -34,9 +37,9 @@
<script setup lang="ts"> <script setup lang="ts">
import { defineProps } from 'vue'; import { defineProps } from 'vue';
import { HttpServerConfig } from '../../../../src/onebot/config/config'; import { WebsocketServerConfig } from '../../../../src/onebot/config/config';
defineProps<{ defineProps<{
config: HttpServerConfig; config: WebsocketServerConfig;
}>(); }>();
</script> </script>

3
napcat.webui/src/pages/network/WebsocketClientComponent.vue
View File

@ -21,6 +21,9 @@
<t-form-item label="心跳间隔"> <t-form-item label="心跳间隔">
<t-input v-model.number="config.heartInterval" type="number" /> <t-input v-model.number="config.heartInterval" type="number" />
</t-form-item> </t-form-item>
<t-form-item label="启用">
<t-checkbox v-model="config.enable" />
</t-form-item>
</t-form> </t-form>
</div> </div>
</div> </div>

32
napcat.webui/src/pages/network/WebsocketServerComponent.vue
View File

@ -1,31 +1,31 @@
<template> <template>
<div class="container"> <div class="container">
<div class="form-container"> <div class="form-container">
<h3>WebSocket Server 配置</h3> <h3>HTTP Server 配置</h3>
<t-form> <t-form>
<t-form-item label="主机">
<t-input v-model="config.host" />
</t-form-item>
<t-form-item label="端口"> <t-form-item label="端口">
<t-input v-model.number="config.port" type="number" /> <t-input v-model.number="config.port" type="number" />
</t-form-item> </t-form-item>
<t-form-item label="消息格式"> <t-form-item label="主机">
<t-input v-model="config.messagePostFormat" /> <t-input v-model="config.host" type="text" />
</t-form-item> </t-form-item>
<t-form-item label="报告自身消息"> <t-form-item label="启用 CORS">
<t-checkbox v-model="config.reportSelfMessage" /> <t-checkbox v-model="config.enableCors" />
</t-form-item>
<t-form-item label="启用 WS">
<t-checkbox v-model="config.enableWebsocket" />
</t-form-item>
<t-form-item label="消息格式">
<t-input v-model="config.messagePostFormat" type="text" />
</t-form-item> </t-form-item>
<t-form-item label="Token"> <t-form-item label="Token">
<t-input v-model="config.token" /> <t-input v-model="config.token" type="text" />
</t-form-item>
<t-form-item label="启用推送事件">
<t-checkbox v-model="config.enablePushEvent" />
</t-form-item> </t-form-item>
<t-form-item label="调试模式"> <t-form-item label="调试模式">
<t-checkbox v-model="config.debug" /> <t-checkbox v-model="config.debug" />
</t-form-item> </t-form-item>
<t-form-item label="心跳间隔"> <t-form-item label="启用">
<t-input v-model.number="config.heartInterval" type="number" /> <t-checkbox v-model="config.enable" />
</t-form-item> </t-form-item>
</t-form> </t-form>
</div> </div>
@ -34,9 +34,9 @@
<script setup lang="ts"> <script setup lang="ts">
import { defineProps } from 'vue'; import { defineProps } from 'vue';
import { WebsocketServerConfig } from '../../../../src/onebot/config/config'; import { HttpServerConfig } from '../../../../src/onebot/config/config';
defineProps<{ defineProps<{
config: WebsocketServerConfig; config: HttpServerConfig;
}>(); }>();
</script> </script>

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

@ -42,7 +42,6 @@ export const httpServerDefaultConfigs = createDefaultAdapterConfig({
enableCors: true, enableCors: true,
enableWebsocket: true, enableWebsocket: true,
messagePostFormat: 'array', messagePostFormat: 'array',
reportSelfMessage: false,
token: '', token: '',
debug: false, debug: false,
}); });
@ -63,13 +62,13 @@ export const websocketServerDefaultConfigs = createDefaultAdapterConfig({
name: 'websocket-server', name: 'websocket-server',
enable: false as boolean, enable: false as boolean,
host: '0.0.0.0', host: '0.0.0.0',
port: 3002, port: 3001,
messagePostFormat: 'array', messagePostFormat: 'array',
reportSelfMessage: false, reportSelfMessage: false,
token: '', token: '',
enablePushEvent: true, enablePushEvent: true,
debug: false, debug: false,
heartInterval: 0, heartInterval: 30000,
}); });
export type WebsocketServerConfig = typeof websocketServerDefaultConfigs; export type WebsocketServerConfig = typeof websocketServerDefaultConfigs;
@ -81,7 +80,7 @@ export const websocketClientDefaultConfigs = createDefaultAdapterConfig({
reportSelfMessage: false, reportSelfMessage: false,
token: '', token: '',
debug: false, debug: false,
heartInterval: 0, heartInterval: 30000,
}); });
export type WebsocketClientConfig = typeof websocketClientDefaultConfigs; export type WebsocketClientConfig = typeof websocketClientDefaultConfigs;
@ -166,7 +165,6 @@ export function migrateOneBotConfigsV1(config: Partial<v1Config>): OneBotConfig
token: config.http.secret, token: config.http.secret,
debug: config.debug, debug: config.debug,
messagePostFormat: config.messagePostFormat, 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) { } else if (ob11Msg.stringMsg.message.length === 0 || ob11Msg.arrayMsg.message.length == 0) {
return; 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) { if (isSelfMsg) {
for (const adapter of notreportSelf_network) { for (const adapter of notreportSelf_network) {
msgMap.delete(adapter.name); msgMap.delete(adapter.name);