From fda2a98b402664f2633d7e154d591b45a92b56bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Sat, 19 Oct 2024 17:54:26 +0800
Subject: [PATCH] version: 3.0.0

---
 manifest.json                                | 2 +-
 package.json                                 | 2 +-
 src/common/version.ts                        | 2 +-
 src/onebot/action/go-cqhttp/GetForwardMsg.ts | 9 ++-------
 src/onebot/types/message.ts                  | 7 +++++++
 src/webui/ui/NapCat.ts                       | 2 +-
 static/assets/renderer.js                    | 2 +-
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/manifest.json b/manifest.json
index 360bb5e7..ebe6edfd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "2.6.27",
+  "version": "3.0.0",
   "icon": "./logo.png",
   "authors": [
     {
diff --git a/package.json b/package.json
index fc907f48..769f865f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.6.27",
+  "version": "3.0.0",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",
diff --git a/src/common/version.ts b/src/common/version.ts
index 63a0246c..235e557a 100644
--- a/src/common/version.ts
+++ b/src/common/version.ts
@@ -1 +1 @@
-export const napCatVersion = '2.6.27';
+export const napCatVersion = '3.0.0';
diff --git a/src/onebot/action/go-cqhttp/GetForwardMsg.ts b/src/onebot/action/go-cqhttp/GetForwardMsg.ts
index 3c47f10b..6c6d4890 100644
--- a/src/onebot/action/go-cqhttp/GetForwardMsg.ts
+++ b/src/onebot/action/go-cqhttp/GetForwardMsg.ts
@@ -1,15 +1,10 @@
 import BaseAction from '../BaseAction';
-import { OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageForward, OB11MessageNode as OriginalOB11MessageNode } from '@/onebot';
+import { OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageForward, OB11MessageNodePlain as OB11MessageNode} from '@/onebot';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { MessageUnique } from '@/common/message-unique';
 
-type OB11MessageNode = OriginalOB11MessageNode & {
-    data: {
-        content?: Array<OB11MessageData>;
-        message: Array<OB11MessageData>;
-    };
-};
+
 
 const SchemaData = {
     type: 'object',
diff --git a/src/onebot/types/message.ts b/src/onebot/types/message.ts
index 0ef01c9b..93ab4180 100644
--- a/src/onebot/types/message.ts
+++ b/src/onebot/types/message.ts
@@ -154,6 +154,13 @@ export interface OB11MessageNode {
     };
 }
 
+export type OB11MessageNodePlain = OB11MessageNode & {
+    data: {
+        content?: Array<OB11MessageData>;
+        message: Array<OB11MessageData>;
+    };
+};
+
 export interface OB11MessageIdMusic {
     type: OB11MessageDataType.music;
     data: IdMusicSignPostData;
diff --git a/src/webui/ui/NapCat.ts b/src/webui/ui/NapCat.ts
index cb41849c..31095bee 100644
--- a/src/webui/ui/NapCat.ts
+++ b/src/webui/ui/NapCat.ts
@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V2.6.27', 'napcat-update-button', 'secondary'),
+                    SettingButton('V3.0.0', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([
diff --git a/static/assets/renderer.js b/static/assets/renderer.js
index ee924be0..688be742 100644
--- a/static/assets/renderer.js
+++ b/static/assets/renderer.js
@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V2.6.27", "napcat-update-button", "secondary")
+          SettingButton("V3.0.0", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([