From 814973af58950d75be92813573afcb60dc6def56 Mon Sep 17 00:00:00 2001
From: "Wesley F. Young" <willamwei@outlook.com>
Date: Mon, 12 Aug 2024 00:09:05 +0800
Subject: [PATCH 1/2] chore: suppress type merging error

---
 src/onebot/helper/config.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/onebot/helper/config.ts b/src/onebot/helper/config.ts
index 9bc5754f..a200c940 100644
--- a/src/onebot/helper/config.ts
+++ b/src/onebot/helper/config.ts
@@ -1,5 +1,6 @@
 import { ConfigBase } from '@/common/utils/ConfigBase';
 
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export interface OB11Config {
     http: {
         enable: boolean;
@@ -33,9 +34,9 @@ export interface OB11Config {
     };
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export class OB11Config extends ConfigBase<OB11Config> {
     getConfigName() {
         return 'onebot11';
     }
-
 }

From b18e86f81c91a8473f6cdc03a595775587046358 Mon Sep 17 00:00:00 2001
From: "Wesley F. Young" <willamwei@outlook.com>
Date: Mon, 12 Aug 2024 00:15:51 +0800
Subject: [PATCH 2/2] fix: core config name

---
 src/core/helper/config.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/core/helper/config.ts b/src/core/helper/config.ts
index 19cc4f03..0468a015 100644
--- a/src/core/helper/config.ts
+++ b/src/core/helper/config.ts
@@ -1,6 +1,7 @@
 import { ConfigBase } from "@/common/utils/ConfigBase";
 import { LogLevel } from "@/common/utils/log";
 
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export interface NapCatConfig {
     fileLog: boolean,
     consoleLog: boolean,
@@ -8,9 +9,9 @@ export interface NapCatConfig {
     consoleLogLevel: LogLevel,
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export class NapCatConfig extends ConfigBase<NapCatConfig> {
     getConfigName() {
-        return 'onebot11';
+        return 'napcat';
     }
-
-}
\ No newline at end of file
+}