feat: 32896

feat: 额外返回原msgSeq条目

.vscode/launch.json

@@ -0,0 +1,115 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:shell",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:shell"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:shell",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:shell"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:universal",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:universal"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:framework",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:framework"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:webui",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:webui"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:universal",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:universal"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:framework",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:framework"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:webui",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:webui"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "lint",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "lint"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "depend",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "depend"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:depend",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:depend"
+            ]
+        }
+    ]
+}

README.md

@@ -1,67 +1,62 @@
 <div align="center">
-  
+
+# NapCat
+
 ![NapCatQQ](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Fnewlogo.png&name=1&owner=1&pattern=Diagonal+Stripes&stargazers=1&theme=Auto)
-  
+
+_Modern protocol-side framework implemented based on NTQQ._
+
+> 云起兮风生，心向远方兮路未曾至.
+
 </div>
 
 ---
-## 欢迎回家
-NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
-## 特性介绍
-- [x] **安装简单**：就算是笨蛋也能使用
-- [x] **性能友好**：就算是低内存也能使用
-- [x] **接口丰富**：就算是没有也能使用
-- [x] **稳定好用**：就算是被捉也能使用
+## Welcome
++ NapCatQQ is a modern implementation of the Bot protocol based on NTQQ.
+  - NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
-## 使用框架
+## Feature
+
++ **Easy to Use**
+  - 作为初学者能够轻松使用.
++ **Quick and Efficient**
+  - 在低内存操作系统长时运行.
++ **Rich API Interface**
+  - 完整实现了大部分标准接口.
++ **Stable and Reliable**
+  - 持续稳定的开发与维护.
+## Quick Start
 
 可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
 
 **首次使用**请务必查看如下文档看使用教程
 
-### 文档地址
+## Link
 
-[Cloudflare.Worker](https://doc.napneko.icu/)
+| Docs | [![Github.IO](https://img.shields.io/badge/docs%20on-Github.IO-orange)](https://napneko.github.io/) | [![Cloudflare.Worker](https://img.shields.io/badge/docs%20on-Cloudflare.Worker-black)](https://doc.napneko.icu/) | [![Cloudflare.HKServer](https://img.shields.io/badge/docs%20on-Cloudflare.HKServer-informational)](https://napcat.napneko.icu/) |
+|:-:|:-:|:-:|:-:|
 
-[Cloudflare.HKServer](https://napcat.napneko.icu/)
+| Docs | [![Cloudflare.Pages](https://img.shields.io/badge/docs%20on-Cloudflare.Pages-blue)](https://napneko.pages.dev/) | [![Server.Other](https://img.shields.io/badge/docs%20on-Server.Other-green)](https://docs.napcat.cyou/) | [![NapCat.Wiki](https://img.shields.io/badge/docs%20on-NapCat.Wiki-red)](https://www.napcat.wiki) |
+|:-:|:-:|:-:|:-:|
 
-[Github.IO](https://napneko.github.io/)
+| Contact | [![QQ Group#1](https://img.shields.io/badge/QQ%20Group%231-Join-blue)](https://qm.qq.com/q/I6LU87a0Yq) | [![QQ Group#2](https://img.shields.io/badge/QQ%20Group%232-Join-blue)](https://qm.qq.com/q/HaRcfrHpUk) | [![Telegram](https://img.shields.io/badge/Telegram-MelodicMoonlight-blue)](https://t.me/MelodicMoonlight) |
+|:-:|:-:|:-:|:-:|
 
-[Cloudflare.Pages](https://napneko.pages.dev/)
+## Thanks
 
-[Server.Other](https://docs.napcat.cyou/)
++ [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
 
-[NapCat.Wiki](https://www.napcat.wiki)
++ [LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目部分开发
 
-## 回家旅途
-[QQ Group#1](https://qm.qq.com/q/I6LU87a0Yq)
-
-[QQ Group#2](https://qm.qq.com/q/HaRcfrHpUk)
-
-[Telegram](https://t.me/MelodicMoonlight)
-
-> QQ Group#2 准许Bot / Telegram与QQ Group#2 为新建Group
-
-## 性能设计/协议标准
-NapCat 已实现90％+的 OneBot / GoCQ 标准接口，并提供兼容性保留接口，其设计理念遵守 无数据库/异步优先/后台刷新 的性能思想。
-
-由此设计带来一系列好处，在开发中，获取群员列表通常小于50Ms，单条文本消息发送在320Ms以内，在1k+的群聊流畅运行，同时带来一些副作用，消息Id无法持久，无法上报撤回消息原始内容。
-
-NapCat 在设计理念下遵守 OneBot 规范大多数要求并且积极改进，任何合理的标准化 Issue 与 Pr 将被接收。
-
-## 感谢他们
-感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
-
-感谢 React 强力驱动 NapCat.WebUi
-
-不过最最重要的 还是需要感谢屏幕前的你哦~
++ 不过最最重要的 还是需要感谢屏幕前的你哦~
 
 ---
 
-## 特殊感谢
-[LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目
+## License
+本项目采用 混合协议 开源，因此使用本项目时，你需要注意以下几点：
+1. 第三方库代码或修改部分遵循其原始开源许可.
+2. 本项目获取部分项目授权而不受部分约束
+2. 项目其余逻辑代码采用[本仓库开源许可](./LICENSE).
 
-## 开源附加
-
-任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**本仓库仅用于提高IM易用性，实现类似Hook推送，此外，禁止任何项目未经仓库主作者授权二次分发或基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**
+**本仓库仅用于提高易用性，实现消息推送类功能，此外，禁止任何项目未经仓库主作者授权基于 NapCat 代码开发。使用请遵守当地法律法规，由此造成的问题由使用者和提供违规使用教程者负责。**

launcher/qqnt.json

@@ -1,10 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.17-30899",
-  "verHash": "ececf273",
-  "linuxVersion": "3.2.15-30899",
-  "linuxVerHash": "63c751e8",
-  "type": "module",
+  "version": "9.9.18-32793",
+  "verHash": "d43f097e",
+  "linuxVersion": "3.2.16-32793",
+  "linuxVerHash": "ee4bd910",
   "private": true,
   "description": "QQ",
   "productName": "QQ",
@@ -17,10 +16,27 @@
   "bin": {
     "qd": "externals/devtools/cli/index.js"
   },
+  "appid": {
+    "win32": "537258389",
+    "darwin": "537258412",
+    "linux": "537258424"
+  },
   "main": "./loadNapCat.js",
-  "buildVersion": "30899",
+  "peerDependenciesMeta": {
+    "*": {
+      "optional": true
+    }
+  },
+  "pnpm": {
+    "patchedDependencies": {
+      "@vue/runtime-dom@3.5.12": "patches/@vue__runtime-dom@3.5.12.patch",
+      "@swc/helpers@0.5.3": "patches/@swc__helpers@0.5.3.patch",
+      "vuex@4.1.0": "patches/vuex@4.1.0.patch"
+    }
+  },
+  "buildVersion": "32793",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",
   "eleArch": "x64"
-}
+}

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.5.2",
+  "version": "4.6.6",
   "icon": "./logo.png",
   "authors": [
     {

napcat.webui/package.json

@@ -13,6 +13,7 @@
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
+    "@heroui/accordion": "^2.2.8",
     "@heroui/avatar": "2.2.7",
     "@heroui/breadcrumbs": "2.2.7",
     "@heroui/button": "2.2.10",
@@ -32,6 +33,7 @@
     "@heroui/pagination": "^2.2.9",
     "@heroui/popover": "2.3.10",
     "@heroui/select": "2.4.10",
+    "@heroui/skeleton": "^2.2.6",
     "@heroui/slider": "2.4.8",
     "@heroui/snippet": "2.2.11",
     "@heroui/spinner": "2.2.7",
@@ -63,6 +65,7 @@
     "qrcode.react": "^4.2.0",
     "quill": "^2.0.3",
     "react": "^19.0.0",
+    "react-color": "^2.19.3",
     "react-dom": "^19.0.0",
     "react-dropzone": "^14.3.5",
     "react-error-boundary": "^5.0.0",

napcat.webui/src/components/ColorPicker.tsx

@@ -0,0 +1,36 @@
+import { Popover, PopoverContent, PopoverTrigger } from '@heroui/popover'
+import React from 'react'
+import { ColorResult, SketchPicker } from 'react-color'
+
+// 假定 heroui 提供的 Popover组件
+
+interface ColorPickerProps {
+  color: string
+  onChange: (color: ColorResult) => void
+}
+
+const ColorPicker: React.FC<ColorPickerProps> = ({ color, onChange }) => {
+  const handleChange = (colorResult: ColorResult) => {
+    onChange(colorResult)
+  }
+
+  return (
+    <Popover triggerScaleOnOpen={false}>
+      <PopoverTrigger>
+        <div
+          className="w-36 h-8 rounded-md cursor-pointer border border-content4"
+          style={{ background: color }}
+        />
+      </PopoverTrigger>
+      <PopoverContent>
+        <SketchPicker
+          color={color}
+          onChange={handleChange}
+          className="!bg-transparent !shadow-none"
+        />
+      </PopoverContent>
+    </Popover>
+  )
+}
+
+export default ColorPicker

napcat.webui/src/components/audio_player.tsx

@@ -231,7 +231,7 @@ export default function AudioPlayer(props: AudioPlayerProps) {
                 : 'top-3 -left-8 rounded-l-full bg-opacity-50 backdrop-blur-md'
             )}
             variant="solid"
-            color="danger"
+            color="primary"
             size="sm"
             onPress={() => setIsCollapsed(!isCollapsed)}
           >

napcat.webui/src/components/button/add_button.tsx

@@ -33,7 +33,7 @@ const AddButton: React.FC<AddButtonProps> = (props) => {
     >
       <DropdownTrigger>
         <Button
-          color="danger"
+          color="primary"
           startContent={<IoAddCircleOutline className="text-2xl" />}
         >
           新建

napcat.webui/src/components/button/save_buttons.tsx

@@ -1,4 +1,5 @@
 import { Button } from '@heroui/button'
+import clsx from 'clsx'
 import toast from 'react-hot-toast'
 import { IoMdRefresh } from 'react-icons/io'
 
@@ -7,15 +8,22 @@ export interface SaveButtonsProps {
   reset: () => void
   refresh?: () => void
   isSubmitting: boolean
+  className?: string
 }
 
 const SaveButtons: React.FC<SaveButtonsProps> = ({
   onSubmit,
   reset,
   isSubmitting,
-  refresh
+  refresh,
+  className
 }) => (
-  <div className="max-w-full mx-3 w-96 flex flex-col justify-center gap-3">
+  <div
+    className={clsx(
+      'max-w-full mx-3 w-96 flex flex-col justify-center gap-3',
+      className
+    )}
+  >
     <div className="flex items-center justify-center gap-2 mt-5">
       <Button
         color="default"
@@ -27,7 +35,7 @@ const SaveButtons: React.FC<SaveButtonsProps> = ({
         取消更改
       </Button>
       <Button
-        color="danger"
+        color="primary"
         isLoading={isSubmitting}
         onPress={() => onSubmit()}
       >

napcat.webui/src/components/chat_input/components/audio_insert.tsx

@@ -110,7 +110,7 @@ const AudioInsert = () => {
         <Tooltip content="发送音频">
           <div className="max-w-fit">
             <PopoverTrigger>
-              <Button color="danger" variant="flat" isIconOnly radius="full">
+              <Button color="primary" variant="flat" isIconOnly radius="full">
                 <IoMic className="text-xl" />
               </Button>
             </PopoverTrigger>
@@ -120,7 +120,7 @@ const AudioInsert = () => {
           <Tooltip content="上传音频">
             <Button
               className="text-lg"
-              color="danger"
+              color="primary"
               isIconOnly
               variant="flat"
               radius="full"
@@ -137,7 +137,7 @@ const AudioInsert = () => {
                 <PopoverTrigger tooltip="输入音频地址">
                   <Button
                     className="text-lg"
-                    color="danger"
+                    color="primary"
                     isIconOnly
                     variant="flat"
                     radius="full"
@@ -154,7 +154,7 @@ const AudioInsert = () => {
                 placeholder="请输入音频地址"
               />
               <Button
-                color="danger"
+                color="primary"
                 variant="flat"
                 isIconOnly
                 radius="full"
@@ -177,7 +177,7 @@ const AudioInsert = () => {
                 <PopoverTrigger>
                   <Button
                     className="text-lg"
-                    color="danger"
+                    color="primary"
                     isIconOnly
                     variant="flat"
                     radius="full"
@@ -190,7 +190,7 @@ const AudioInsert = () => {
             <PopoverContent className="flex-col gap-2 p-4">
               <div className="flex gap-2">
                 <Button
-                  color={isRecording ? 'danger' : 'danger'}
+                  color={isRecording ? 'primary' : 'primary'}
                   variant="flat"
                   onPress={isRecording ? stopRecording : startRecording}
                 >
@@ -198,7 +198,7 @@ const AudioInsert = () => {
                 </Button>
                 {showPreview && audioPreview && (
                   <Button
-                    color="danger"
+                    color="primary"
                     variant="flat"
                     onPress={handleShowPreview}
                   >
@@ -212,7 +212,7 @@ const AudioInsert = () => {
                     className={clsx(
                       'w-4 h-4 rounded-full',
                       isRecording
-                        ? 'animate-pulse bg-danger-400'
+                        ? 'animate-pulse bg-primary-400'
                         : 'bg-success-400'
                     )}
                   ></span>

napcat.webui/src/components/chat_input/components/dice_insert.tsx

@@ -10,7 +10,7 @@ const DiceInsert = () => {
   return (
     <Tooltip content="发送骰子">
       <Button
-        color="danger"
+        color="primary"
         variant="flat"
         isIconOnly
         radius="full"

napcat.webui/src/components/chat_input/components/emoji_picker.tsx

@@ -55,7 +55,7 @@ const EmojiPicker = ({ onInsertEmoji, onOpenChange }: EmojiPickerProps) => {
         <Tooltip content="插入表情">
           <div className="max-w-fit">
             <PopoverTrigger>
-              <Button color="danger" variant="flat" isIconOnly radius="full">
+              <Button color="primary" variant="flat" isIconOnly radius="full">
                 <MdEmojiEmotions className="text-xl" />
               </Button>
             </PopoverTrigger>
@@ -65,7 +65,7 @@ const EmojiPicker = ({ onInsertEmoji, onOpenChange }: EmojiPickerProps) => {
           {visibleEmojis.map((emoji) => (
             <Button
               key={emoji.id}
-              color="danger"
+              color="primary"
               variant="flat"
               isIconOnly
               radius="full"

napcat.webui/src/components/chat_input/components/file_insert.tsx

@@ -35,7 +35,7 @@ const FileInsert = () => {
         <Tooltip content="发送文件">
           <div className="max-w-fit">
             <PopoverTrigger>
-              <Button color="danger" variant="flat" isIconOnly radius="full">
+              <Button color="primary" variant="flat" isIconOnly radius="full">
                 <FaFolder className="text-lg" />
               </Button>
             </PopoverTrigger>
@@ -45,7 +45,7 @@ const FileInsert = () => {
           <Tooltip content="上传文件">
             <Button
               className="text-lg"
-              color="danger"
+              color="primary"
               isIconOnly
               variant="flat"
               radius="full"
@@ -62,7 +62,7 @@ const FileInsert = () => {
                 <PopoverTrigger tooltip="输入文件地址">
                   <Button
                     className="text-lg"
-                    color="danger"
+                    color="primary"
                     isIconOnly
                     variant="flat"
                     radius="full"
@@ -79,7 +79,7 @@ const FileInsert = () => {
                 placeholder="请输入文件地址"
               />
               <Button
-                color="danger"
+                color="primary"
                 variant="flat"
                 isIconOnly
                 radius="full"

napcat.webui/src/components/chat_input/components/image_insert.tsx

@@ -23,7 +23,7 @@ const ImageInsert = ({ insertImage, onOpenChange }: ImageInsertProps) => {
         <Tooltip content="插入图片">
           <div className="max-w-fit">
             <PopoverTrigger>
-              <Button color="danger" variant="flat" isIconOnly radius="full">
+              <Button color="primary" variant="flat" isIconOnly radius="full">
                 <MdImage className="text-xl" />
               </Button>
             </PopoverTrigger>
@@ -33,7 +33,7 @@ const ImageInsert = ({ insertImage, onOpenChange }: ImageInsertProps) => {
           <Tooltip content="上传图片">
             <Button
               className="text-lg"
-              color="danger"
+              color="primary"
               isIconOnly
               variant="flat"
               radius="full"
@@ -50,7 +50,7 @@ const ImageInsert = ({ insertImage, onOpenChange }: ImageInsertProps) => {
                 <PopoverTrigger tooltip="输入图片地址">
                   <Button
                     className="text-lg"
-                    color="danger"
+                    color="primary"
                     isIconOnly
                     variant="flat"
                     radius="full"
@@ -67,7 +67,7 @@ const ImageInsert = ({ insertImage, onOpenChange }: ImageInsertProps) => {
                 placeholder="请输入图片地址"
               />
               <Button
-                color="danger"
+                color="primary"
                 variant="flat"
                 isIconOnly
                 radius="full"

napcat.webui/src/components/chat_input/components/music_insert.tsx

@@ -80,7 +80,7 @@ const MusicInsert = () => {
         <Tooltip content="发送音乐">
           <div className="max-w-fit">
             <PopoverTrigger>
-              <Button color="danger" variant="flat" isIconOnly radius="full">
+              <Button color="primary" variant="flat" isIconOnly radius="full">
                 <IoMusicalNotes className="text-xl" />
               </Button>
             </PopoverTrigger>
@@ -132,7 +132,7 @@ const MusicInsert = () => {
               <Button
                 fullWidth
                 size="lg"
-                color="danger"
+                color="primary"
                 variant="flat"
                 radius="full"
                 onPress={() => {
@@ -236,7 +236,7 @@ const MusicInsert = () => {
                 <Button
                   fullWidth
                   size="lg"
-                  color="danger"
+                  color="primary"
                   variant="flat"
                   radius="full"
                   type="submit"

napcat.webui/src/components/chat_input/components/reply_insert.tsx

@@ -19,7 +19,7 @@ const ReplyInsert = ({ insertReply }: ReplyInsertProps) => {
         <Tooltip content="回复消息">
           <div className="max-w-fit">
             <PopoverTrigger>
-              <Button color="danger" variant="flat" isIconOnly radius="full">
+              <Button color="primary" variant="flat" isIconOnly radius="full">
                 <BsChatQuoteFill className="text-lg" />
               </Button>
             </PopoverTrigger>
@@ -38,7 +38,7 @@ const ReplyInsert = ({ insertReply }: ReplyInsertProps) => {
             }}
           />
           <Button
-            color="danger"
+            color="primary"
             variant="flat"
             radius="full"
             isIconOnly

napcat.webui/src/components/chat_input/components/rps_insert.tsx

@@ -10,7 +10,7 @@ const RPSInsert = () => {
   return (
     <Tooltip content="发送猜拳">
       <Button
-        color="danger"
+        color="primary"
         variant="flat"
         isIconOnly
         radius="full"

napcat.webui/src/components/chat_input/components/video_insert.tsx

@@ -35,7 +35,7 @@ const VideoInsert = () => {
         <Tooltip content="发送视频">
           <div className="max-w-fit">
             <PopoverTrigger>
-              <Button color="danger" variant="flat" isIconOnly radius="full">
+              <Button color="primary" variant="flat" isIconOnly radius="full">
                 <IoVideocam className="text-xl" />
               </Button>
             </PopoverTrigger>
@@ -45,7 +45,7 @@ const VideoInsert = () => {
           <Tooltip content="上传视频">
             <Button
               className="text-lg"
-              color="danger"
+              color="primary"
               isIconOnly
               variant="flat"
               radius="full"
@@ -62,7 +62,7 @@ const VideoInsert = () => {
                 <PopoverTrigger tooltip="输入视频地址">
                   <Button
                     className="text-lg"
-                    color="danger"
+                    color="primary"
                     isIconOnly
                     variant="flat"
                     radius="full"
@@ -79,7 +79,7 @@ const VideoInsert = () => {
                 placeholder="请输入视频地址"
               />
               <Button
-                color="danger"
+                color="primary"
                 variant="flat"
                 isIconOnly
                 radius="full"

napcat.webui/src/components/chat_input/index.tsx

@@ -190,7 +190,7 @@ const ChatInput = () => {
         <DiceInsert />
         <RPSInsert />
         <Button
-          color="danger"
+          color="primary"
           onPress={() => {
             const messages = getChatMessage()
             showStructuredMessage(messages)

napcat.webui/src/components/chat_input/modal.tsx

@@ -15,7 +15,7 @@ export default function ChatInputModal() {
 
   return (
     <>
-      <Button onPress={onOpen} color="danger" radius="full" variant="flat">
+      <Button onPress={onOpen} color="primary" radius="full" variant="flat">
         构造聊天消息
       </Button>
       <Modal
@@ -36,7 +36,7 @@ export default function ChatInputModal() {
                 </div>
               </ModalBody>
               <ModalFooter>
-                <Button color="danger" onPress={onClose} variant="flat">
+                <Button color="primary" onPress={onClose} variant="flat">
                   关闭
                 </Button>
               </ModalFooter>

napcat.webui/src/components/display_card/common_card.tsx

@@ -78,7 +78,7 @@ const NetworkDisplayCard = <T extends keyof NetworkType>({
             {debug ? '关闭调试' : '开启调试'}
           </Button>
           <Button
-            color="danger"
+            color="primary"
             startContent={<MdDeleteForever />}
             onPress={handleDelete}
           >

napcat.webui/src/components/display_network_item.tsx

@@ -19,7 +19,7 @@ const NetworkItemDisplay: React.FC<NetworkItemDisplayProps> = ({
       className={clsx(
         'bg-opacity-60 shadow-sm md:rounded-3xl',
         size === 'md'
-          ? 'col-span-8 md:col-span-2 bg-danger-50 shadow-danger-100'
+          ? 'col-span-8 md:col-span-2 bg-primary-50 shadow-primary-100'
           : 'col-span-2 md:col-span-1 bg-warning-100 shadow-warning-200'
       )}
       shadow="sm"

napcat.webui/src/components/file_manage/create_file_modal.tsx

@@ -33,7 +33,7 @@ export default function CreateFileModal({
         <ModalHeader>新建</ModalHeader>
         <ModalBody>
           <div className="flex flex-col gap-4">
-            <ButtonGroup color="danger">
+            <ButtonGroup color="primary">
               <Button
                 variant={fileType === 'file' ? 'solid' : 'flat'}
                 onPress={() => onTypeChange('file')}
@@ -51,10 +51,10 @@ export default function CreateFileModal({
           </div>
         </ModalBody>
         <ModalFooter>
-          <Button color="danger" variant="flat" onPress={onClose}>
+          <Button color="primary" variant="flat" onPress={onClose}>
             取消
           </Button>
-          <Button color="danger" onPress={onCreate}>
+          <Button color="primary" onPress={onCreate}>
             创建
           </Button>
         </ModalFooter>

napcat.webui/src/components/file_manage/file_edit_modal.tsx

@@ -81,10 +81,10 @@ export default function FileEditModal({
           </div>
         </ModalBody>
         <ModalFooter>
-          <Button color="danger" variant="flat" onPress={onClose}>
+          <Button color="primary" variant="flat" onPress={onClose}>
             取消
           </Button>
-          <Button color="danger" onPress={onSave}>
+          <Button color="primary" onPress={onSave}>
             保存
           </Button>
         </ModalFooter>

napcat.webui/src/components/file_manage/file_preview_modal.tsx

@@ -45,6 +45,12 @@ export default function FilePreviewModal({
     }
   )
 
+  useEffect(() => {
+    if (filePath) {
+      run()
+    }
+  }, [filePath])
+
   let contentElement = null
   if (!supportedPreviewExts.includes(ext)) {
     contentElement = <div>暂不支持预览此文件类型</div>
@@ -68,12 +74,6 @@ export default function FilePreviewModal({
     )
   }
 
-  useEffect(() => {
-    if (filePath) {
-      run()
-    }
-  }, [])
-
   return (
     <Modal isOpen={isOpen} onClose={onClose} scrollBehavior="inside" size="3xl">
       <ModalContent>
@@ -82,7 +82,7 @@ export default function FilePreviewModal({
           {contentElement}
         </ModalBody>
         <ModalFooter>
-          <Button color="danger" variant="flat" onPress={onClose}>
+          <Button color="primary" variant="flat" onPress={onClose}>
             关闭
           </Button>
         </ModalFooter>

napcat.webui/src/components/file_manage/file_table.tsx

@@ -82,7 +82,7 @@ export default function FileTable({
     setPreviewImages([])
     setPreviewIndex(0)
     setShowImage(false)
-  }, [files])
+  }, [currentPath])
 
   const onPreviewImage = (name: string, images: PreviewImage[]) => {
     const index = images.findIndex((image) => image.key === name)
@@ -116,7 +116,7 @@ export default function FileTable({
               isCompact
               showControls
               showShadow
-              color="danger"
+              color="primary"
               page={page}
               total={pages}
               onChange={(page) => setPage(page)}
@@ -195,7 +195,7 @@ export default function FileTable({
                   <ButtonGroup size="sm">
                     <Button
                       isIconOnly
-                      color="danger"
+                      color="primary"
                       variant="flat"
                       onPress={() => onRenameRequest(file.name)}
                     >
@@ -203,7 +203,7 @@ export default function FileTable({
                     </Button>
                     <Button
                       isIconOnly
-                      color="danger"
+                      color="primary"
                       variant="flat"
                       onPress={() => onMoveRequest(file.name)}
                     >
@@ -211,7 +211,7 @@ export default function FileTable({
                     </Button>
                     <Button
                       isIconOnly
-                      color="danger"
+                      color="primary"
                       variant="flat"
                       onPress={() => onCopyPath(file.name)}
                     >
@@ -219,7 +219,7 @@ export default function FileTable({
                     </Button>
                     <Button
                       isIconOnly
-                      color="danger"
+                      color="primary"
                       variant="flat"
                       onPress={() => onDownload(filePath)}
                     >
@@ -227,7 +227,7 @@ export default function FileTable({
                     </Button>
                     <Button
                       isIconOnly
-                      color="danger"
+                      color="primary"
                       variant="flat"
                       onPress={() => onDelete(filePath)}
                     >

napcat.webui/src/components/file_manage/image_name_button.tsx

@@ -58,6 +58,7 @@ export default function ImageNameButton({
       run()
     }
   }, [])
+
   return (
     <Button
       variant="light"
@@ -69,7 +70,15 @@ export default function ImageNameButton({
         ) : loading || !data ? (
           <Spinner size="sm" />
         ) : (
-          <Image src={data} alt={name} className="w-8 h-8" radius="sm" />
+          <Image
+            src={data}
+            alt={name}
+            className="w-8 h-8 flex-shrink-0"
+            classNames={{
+              wrapper: 'w-8 h-8 flex-shrink-0'
+            }}
+            radius="sm"
+          />
         )
       }
     >

napcat.webui/src/components/file_manage/move_modal.tsx

@@ -86,13 +86,13 @@ function DirectoryTree({
         onPress={handleClick}
         className="py-1 px-2 text-left justify-start min-w-0 min-h-0 h-auto text-sm rounded-md"
         size="sm"
-        color="danger"
+        color="primary"
         variant={variant}
         startContent={
           <div
             className={clsx(
               'rounded-md',
-              isSeleted ? 'bg-danger-600' : 'bg-danger-50'
+              isSeleted ? 'bg-primary-600' : 'bg-primary-50'
             )}
           >
             {expanded ? <IoRemove /> : <IoAdd />}
@@ -105,7 +105,7 @@ function DirectoryTree({
         <div>
           {loading ? (
             <div className="flex py-1 px-8">
-              <Spinner size="sm" color="danger" />
+              <Spinner size="sm" color="primary" />
             </div>
           ) : (
             dirs.map((dirName) => {
@@ -155,10 +155,10 @@ export default function MoveModal({
           <p className="text-sm text-default-500">移动项：{selectionInfo}</p>
         </ModalBody>
         <ModalFooter>
-          <Button color="danger" variant="flat" onPress={onClose}>
+          <Button color="primary" variant="flat" onPress={onClose}>
             取消
           </Button>
-          <Button color="danger" onPress={onMove}>
+          <Button color="primary" onPress={onMove}>
             确定
           </Button>
         </ModalFooter>

napcat.webui/src/components/file_manage/rename_modal.tsx

@@ -31,10 +31,10 @@ export default function RenameModal({
           <Input label="新名称" value={newFileName} onChange={onNameChange} />
         </ModalBody>
         <ModalFooter>
-          <Button color="danger" variant="flat" onPress={onClose}>
+          <Button color="primary" variant="flat" onPress={onClose}>
             取消
           </Button>
-          <Button color="danger" onPress={onRename}>
+          <Button color="primary" onPress={onRename}>
             确定
           </Button>
         </ModalFooter>

napcat.webui/src/components/hitokoto.tsx

@@ -33,7 +33,7 @@ export default function Hitokoto() {
       <div className="relative">
         {loading && <PageLoading />}
         {error ? (
-          <div className="text-danger-400">一言加载失败：{error.message}</div>
+          <div className="text-primary-400">一言加载失败：{error.message}</div>
         ) : (
           <>
             <div>{data?.hitokoto}</div>
@@ -52,7 +52,7 @@ export default function Hitokoto() {
             isLoading={loading}
             isIconOnly
             radius="full"
-            color="danger"
+            color="primary"
             variant="flat"
           >
             <IoRefresh />

napcat.webui/src/components/hover_titled_card.tsx

@@ -34,7 +34,7 @@ export default function HoverTiltedCard({
   rotateAmplitude = 14,
   showTooltip = false,
   overlayContent = (
-    <div className="text-center mt-6 px-4 py-0.5 shadow-lg rounded-full bg-danger-600 text-default-100 bg-opacity-80">
+    <div className="text-center mt-6 px-4 py-0.5 shadow-lg rounded-full bg-primary-600 text-default-100 bg-opacity-80">
       NapCat
     </div>
   ),

napcat.webui/src/components/input/file_input.tsx

@@ -0,0 +1,69 @@
+import { Button } from '@heroui/button'
+import { Input } from '@heroui/input'
+import { useRef, useState } from 'react'
+
+export interface FileInputProps {
+  onChange: (file: File) => Promise<void> | void
+  onDelete?: () => Promise<void> | void
+  label?: string
+  accept?: string
+}
+
+const FileInput: React.FC<FileInputProps> = ({
+  onChange,
+  onDelete,
+  label,
+  accept
+}) => {
+  const inputRef = useRef<HTMLInputElement>(null)
+  const [isLoading, setIsLoading] = useState(false)
+  return (
+    <div className="flex items-end gap-2">
+      <div className="flex-grow">
+        <Input
+          isDisabled={isLoading}
+          ref={inputRef}
+          label={label}
+          type="file"
+          placeholder="选择文件"
+          accept={accept}
+          onChange={async (e) => {
+            try {
+              setIsLoading(true)
+              const file = e.target.files?.[0]
+              if (file) {
+                await onChange(file)
+              }
+            } catch (error) {
+              console.error(error)
+            } finally {
+              setIsLoading(false)
+              if (inputRef.current) inputRef.current.value = ''
+            }
+          }}
+        />
+      </div>
+      <Button
+        isDisabled={isLoading}
+        onPress={async () => {
+          try {
+            setIsLoading(true)
+            if (onDelete) await onDelete()
+          } catch (error) {
+            console.error(error)
+          } finally {
+            setIsLoading(false)
+            if (inputRef.current) inputRef.current.value = ''
+          }
+        }}
+        color="primary"
+        variant="flat"
+        size="sm"
+      >
+        删除
+      </Button>
+    </div>
+  )
+}
+
+export default FileInput

napcat.webui/src/components/input/image_input.tsx

@@ -43,7 +43,7 @@ const ImageInput: React.FC<ImageInputProps> = ({ onChange, value, label }) => {
           onChange('')
           if (inputRef.current) inputRef.current.value = ''
         }}
-        color="danger"
+        color="primary"
         variant="flat"
         size="sm"
       >

napcat.webui/src/components/log_com/log_level_select.tsx

@@ -16,13 +16,13 @@ const logLevelColor: {
     | 'secondary'
     | 'success'
     | 'warning'
-    | 'danger'
+    | 'primary'
 } = {
   [LogLevel.DEBUG]: 'default',
   [LogLevel.INFO]: 'primary',
   [LogLevel.WARN]: 'warning',
-  [LogLevel.ERROR]: 'danger',
-  [LogLevel.FATAL]: 'danger'
+  [LogLevel.ERROR]: 'primary',
+  [LogLevel.FATAL]: 'primary'
 }
 const LogLevelSelect = (props: LogLevelSelectProps) => {
   const { selectedKeys, onSelectionChange } = props

napcat.webui/src/components/modal.tsx

@@ -65,7 +65,7 @@ const Modal: React.FC<ModalProps> = React.memo((props) => {
             <ModalFooter>
               {showCancel && (
                 <Button
-                  color="danger"
+                  color="primary"
                   variant="light"
                   onPress={() => {
                     onCancel?.()
@@ -76,7 +76,7 @@ const Modal: React.FC<ModalProps> = React.memo((props) => {
                 </Button>
               )}
               <Button
-                color="danger"
+                color="primary"
                 onPress={() => {
                   onConfirm?.()
                   nativeClose()

napcat.webui/src/components/napcat_repo_info.tsx

@@ -28,7 +28,7 @@ import type {
 
 function displayData(data: number, loading: boolean, error?: Error) {
   if (error) {
-    return <MdError className="text-danger-400" />
+    return <MdError className="text-primary-400" />
   }
 
   if (loading) {
@@ -175,7 +175,7 @@ export default function NapCatRepoInfo() {
         className="group h-auto py-3"
         endContent={
           releaseError ? (
-            <MdError className="text-danger-400" />
+            <MdError className="text-primary-400" />
           ) : releaseLoading ? (
             <Spinner size="sm" />
           ) : (
@@ -229,7 +229,7 @@ export default function NapCatRepoInfo() {
           </span>
         }
         startContent={
-          <IconWrapper className="bg-danger/10 text-danger dark:text-danger-500">
+          <IconWrapper className="bg-primary/10 text-primary dark:text-primary-500">
             <BookIcon />
           </IconWrapper>
         }

napcat.webui/src/components/network_edit/generic_form.tsx

@@ -150,7 +150,7 @@ const GenericForm = <T extends keyof NetworkConfigType>({
       </ModalBody>
       <ModalFooter>
         <Button
-          color="danger"
+          color="primary"
           isDisabled={formState.isSubmitting}
           variant="light"
           onPress={onClose}

napcat.webui/src/components/network_edit/ws_server.tsx

@@ -20,7 +20,7 @@ const WebsocketServerForm: React.FC<WebsocketServerFormProps> = ({
     enable: false,
     name: '',
     host: '0.0.0.0',
-    port: 3000,
+    port: 3001,
     reportSelfMessage: false,
     enableForcePushEvent: true,
     messagePostFormat: 'array',

napcat.webui/src/components/onebot/api/debug.tsx

@@ -91,7 +91,7 @@ const OneBotApiDebug: React.FC<OneBotApiDebugProps> = (props) => {
 
   return (
     <section className="p-4 pt-14 rounded-lg shadow-md">
-      <h1 className="text-2xl font-bold mb-4 flex items-center gap-1 text-danger-400">
+      <h1 className="text-2xl font-bold mb-4 flex items-center gap-1 text-primary-400">
         <PiCatDuotone />
         {data.description}
       </h1>
@@ -125,7 +125,7 @@ const OneBotApiDebug: React.FC<OneBotApiDebugProps> = (props) => {
         />
         <Button
           onPress={sendRequest}
-          color="danger"
+          color="primary"
           size="lg"
           radius="full"
           isIconOnly
@@ -136,7 +136,7 @@ const OneBotApiDebug: React.FC<OneBotApiDebugProps> = (props) => {
       </div>
       <Card
         shadow="sm"
-        className="my-4 bg-opacity-50 backdrop-blur-md overflow-visible z-20"
+        className="my-4 bg-opacity-50 backdrop-blur-md overflow-visible"
       >
         <CardHeader className="font-bold text-lg gap-1 pb-0">
           <span className="mr-2">请求体</span>

napcat.webui/src/components/onebot/api/display_struct.tsx

@@ -27,7 +27,7 @@ const SchemaType = ({
       name = '固定值'
       break
   }
-  let chipColor: 'primary' | 'success' | 'danger' | 'warning' | 'secondary' =
+  let chipColor: 'primary' | 'success' | 'primary' | 'warning' | 'secondary' =
     'primary'
   switch (type) {
     case 'enum':
@@ -37,7 +37,7 @@ const SchemaType = ({
       chipColor = 'secondary'
       break
     case 'array':
-      chipColor = 'danger'
+      chipColor = 'primary'
       break
     case 'object':
       chipColor = 'success'

napcat.webui/src/components/onebot/api/nav_list.tsx

@@ -33,11 +33,11 @@ const OneBotApiNavList: React.FC<OneBotApiNavListProps> = (props) => {
     >
       <div className="w-64 h-full overflow-y-auto px-2 pt-2 pb-10 md:pb-0">
         <Input
-          className="sticky top-0 z-10 text-danger-600"
+          className="sticky top-0 z-10 text-primary-600"
           classNames={{
             inputWrapper:
-              'bg-opacity-30 bg-danger-50 backdrop-blur-sm border border-danger-300 mb-2',
-            input: 'bg-transparent !text-danger-400 !placeholder-danger-400'
+              'bg-opacity-30 bg-primary-50 backdrop-blur-sm border border-primary-300 mb-2',
+            input: 'bg-transparent !text-primary-400 !placeholder-primary-400'
           }}
           radius="full"
           placeholder="搜索 API"
@@ -51,7 +51,7 @@ const OneBotApiNavList: React.FC<OneBotApiNavListProps> = (props) => {
             key={apiName}
             shadow="none"
             className={clsx(
-              'w-full border border-danger-100 rounded-lg mb-1 bg-opacity-30 backdrop-blur-sm text-danger-400',
+              'w-full border border-primary-100 rounded-lg mb-1 bg-opacity-30 backdrop-blur-sm text-primary-400',
               {
                 hidden: !(
                   apiName.includes(searchValue) ||
@@ -59,7 +59,7 @@ const OneBotApiNavList: React.FC<OneBotApiNavListProps> = (props) => {
                 )
               },
               {
-                '!bg-opacity-40 border border-danger-400 bg-danger-50 text-danger-600':
+                '!bg-opacity-40 border border-primary-400 bg-primary-50 text-primary-600':
                   apiName === selectedApi
               }
             )}
@@ -69,8 +69,8 @@ const OneBotApiNavList: React.FC<OneBotApiNavListProps> = (props) => {
             <CardBody>
               <h2 className="font-bold">{api.description}</h2>
               <div
-                className={clsx('text-sm text-danger-200', {
-                  '!text-danger-400': apiName === selectedApi
+                className={clsx('text-sm text-primary-200', {
+                  '!text-primary-400': apiName === selectedApi
                 })}
               >
                 {apiName}

napcat.webui/src/components/onebot/display_card/render.tsx

@@ -109,7 +109,7 @@ const OneBotItemRender = ({ data, index, style }: OneBotItemRenderProps) => {
                 <PopoverTrigger>
                   <Button
                     size="sm"
-                    color="danger"
+                    color="primary"
                     variant="flat"
                     radius="full"
                     isIconOnly

napcat.webui/src/components/onebot/display_card/response.tsx

@@ -30,7 +30,7 @@ const OneBotDisplayResponse: React.FC<OneBotDisplayResponseProps> = ({
           <PopoverTrigger>
             <Button
               size="sm"
-              color="danger"
+              color="primary"
               variant="flat"
               radius="full"
               className="text-medium"

napcat.webui/src/components/onebot/send_modal.tsx

@@ -43,7 +43,7 @@ const OneBotSendModal: React.FC<OneBotSendModalProps> = (props) => {
 
   return (
     <>
-      <Button onPress={onOpen} color="danger" radius="full" variant="flat">
+      <Button onPress={onOpen} color="primary" radius="full" variant="flat">
         构造请求
       </Button>
       <Modal
@@ -75,11 +75,11 @@ const OneBotSendModal: React.FC<OneBotSendModalProps> = (props) => {
               <ModalFooter>
                 <ChatInputModal />
 
-                <Button color="danger" variant="flat" onPress={onClose}>
+                <Button color="primary" variant="flat" onPress={onClose}>
                   取消
                 </Button>
                 <Button
-                  color="danger"
+                  color="primary"
                   onPress={() => handleSendMessage(onClose)}
                 >
                   发送

napcat.webui/src/components/onebot/ws_status.tsx

@@ -10,7 +10,7 @@ function StatusTag({
   color
 }: {
   title: string
-  color: 'success' | 'danger' | 'warning'
+  color: 'success' | 'primary' | 'warning'
 }) {
   const textClassName = `text-${color} text-sm`
   const bgClassName = `bg-${color}`
@@ -27,7 +27,7 @@ export default function WSStatus({ state }: WSStatusProps) {
     return <StatusTag title="已连接" color="success" />
   }
   if (state === ReadyState.CLOSED) {
-    return <StatusTag title="已关闭" color="danger" />
+    return <StatusTag title="已关闭" color="primary" />
   }
   if (state === ReadyState.CONNECTING) {
     return <StatusTag title="连接中" color="warning" />

napcat.webui/src/components/qq_info_card.tsx

@@ -16,7 +16,7 @@ export interface QQInfoCardProps {
 const QQInfoCard: React.FC<QQInfoCardProps> = ({ data, error, loading }) => {
   return (
     <Card
-      className="relative bg-danger-100 bg-opacity-60 overflow-hidden flex-shrink-0 shadow-md shadow-danger-300 dark:shadow-danger-50"
+      className="relative bg-primary-100 bg-opacity-60 overflow-hidden flex-shrink-0 shadow-md shadow-primary-300 dark:shadow-primary-50"
       shadow="none"
       radius="lg"
     >
@@ -30,7 +30,7 @@ const QQInfoCard: React.FC<QQInfoCardProps> = ({ data, error, loading }) => {
         </CardBody>
       ) : (
         <CardBody className="flex-row items-center gap-2 overflow-hidden relative">
-          <div className="absolute right-0 bottom-0 text-5xl text-danger-400">
+          <div className="absolute right-0 bottom-0 text-5xl text-primary-400">
             <BsTencentQq />
           </div>
           <div className="relative flex-shrink-0 z-10">
@@ -43,14 +43,14 @@ const QQInfoCard: React.FC<QQInfoCardProps> = ({ data, error, loading }) => {
             />
             <div
               className={clsx(
-                'w-4 h-4 rounded-full absolute right-0.5 bottom-0 border-2 border-danger-100 z-10',
+                'w-4 h-4 rounded-full absolute right-0.5 bottom-0 border-2 border-primary-100 z-10',
                 data?.online ? 'bg-green-500' : 'bg-gray-500'
               )}
             ></div>
           </div>
           <div className="flex-col justify-center">
             <div className="text-lg truncate">{data?.nick}</div>
-            <div className="text-danger-500 text-sm">{data?.uin}</div>
+            <div className="text-primary-500 text-sm">{data?.uin}</div>
           </div>
         </CardBody>
       )}

napcat.webui/src/components/qr_code_login.tsx

@@ -11,7 +11,7 @@ const QrCodeLogin: React.FC<QrCodeLoginProps> = ({ qrcode }) => {
       <div className="bg-white p-2 rounded-md w-fit mx-auto relative overflow-hidden">
         {!qrcode && (
           <div className="absolute left-2 top-2 right-2 bottom-2 bg-white bg-opacity-50 backdrop-blur flex items-center justify-center">
-            <Spinner color="danger" />
+            <Spinner color="primary" />
           </div>
         )}
         <QRCodeSVG size={180} value={qrcode} />

napcat.webui/src/components/sidebar/index.tsx

@@ -63,7 +63,7 @@ const SideBar: React.FC<SideBarProps> = (props) => {
           <div className="mt-auto mb-10 md:mb-0">
             <Button
               className="w-full"
-              color="danger"
+              color="primary"
               radius="full"
               variant="light"
               onPress={toggleTheme}
@@ -75,7 +75,7 @@ const SideBar: React.FC<SideBarProps> = (props) => {
             </Button>
             <Button
               className="w-full mb-2"
-              color="danger"
+              color="primary"
               radius="full"
               variant="light"
               onPress={onRevokeAuth}

napcat.webui/src/components/sidebar/menus.tsx

@@ -55,15 +55,16 @@ const renderItems = (items: MenuItem[], children = false) => {
             isActive && 'bg-opacity-60',
             b64img && 'backdrop-blur-md text-white'
           )}
-          color="danger"
+          color="primary"
           endContent={
             canOpen ? (
-              // div实现箭头V效果
               <div
                 className={clsx(
                   'ml-auto relative w-3 h-3 transition-transform',
                   open && 'transform rotate-180',
-                  isActive ? 'text-danger-500' : 'text-red-300 dark:text-white',
+                  isActive
+                    ? 'text-primary-500'
+                    : 'text-primary-200 dark:text-white',
                   'before:rounded-full',
                   'before:content-[""]',
                   'before:block',
@@ -95,8 +96,8 @@ const renderItems = (items: MenuItem[], children = false) => {
                 className={clsx(
                   'w-3 h-1.5 rounded-full ml-auto shadow-lg',
                   isActive
-                    ? 'bg-danger-500 animate-spinner-ease-spin'
-                    : 'bg-red-300 dark:bg-white'
+                    ? 'bg-primary-500 animate-spinner-ease-spin'
+                    : 'bg-primary-200 dark:bg-white'
                 )}
               />
             )

napcat.webui/src/components/system_info.tsx

@@ -4,6 +4,8 @@ import { Chip } from '@heroui/chip'
 import { Spinner } from '@heroui/spinner'
 import { Tooltip } from '@heroui/tooltip'
 import { useRequest } from 'ahooks'
+import { useEffect } from 'react'
+import { BsStars } from 'react-icons/bs'
 import { FaCircleInfo, FaInfo, FaQq } from 'react-icons/fa6'
 import { IoLogoChrome, IoLogoOctocat } from 'react-icons/io'
 import { RiMacFill } from 'react-icons/ri'
@@ -32,10 +34,10 @@ const SystemInfoItem: React.FC<SystemInfoItemProps> = ({
   endContent
 }) => {
   return (
-    <div className="flex text-sm gap-1 p-2 items-center shadow-sm shadow-danger-50 dark:shadow-danger-100 rounded text-danger-400">
+    <div className="flex text-sm gap-1 p-2 items-center shadow-sm shadow-primary-100 dark:shadow-primary-100 rounded text-primary-400">
       {icon}
       <div className="w-24">{title}</div>
-      <div className="text-danger-200">{value}</div>
+      <div className="text-primary-200">{value}</div>
       <div className="ml-auto">{endContent}</div>
     </div>
   )
@@ -60,7 +62,7 @@ const NewVersionTip = (props: NewVersionTipProps) => {
         <Button
           isIconOnly
           radius="full"
-          color="danger"
+          color="primary"
           variant="shadow"
           className="!w-5 !h-5 !min-w-0 text-small shadow-md"
           onPress={() => {
@@ -97,12 +99,48 @@ const NewVersionTip = (props: NewVersionTipProps) => {
     }
   }
 
+  const AISummaryComponent = () => {
+    const {
+      data: aiSummaryData,
+      loading: aiSummaryLoading,
+      error: aiSummaryError,
+      run: runAiSummary
+    } = useRequest(
+      (version) =>
+        request.get<ServerResponse<string | null>>(
+          `https://release.nc.152710.xyz/?version=${version}`,
+          {
+            timeout: 30000
+          }
+        ),
+      {
+        manual: true
+      }
+    )
+
+    useEffect(() => {
+      runAiSummary(currentVersion)
+    }, [currentVersion, runAiSummary])
+
+    if (aiSummaryLoading) {
+      return (
+        <div className="flex justify-center py-1">
+          <Spinner size="sm" />
+        </div>
+      )
+    }
+    if (aiSummaryError) {
+      return <div className="text-center text-primary-500">AI 摘要获取失败</div>
+    }
+    return <span className="text-default-700">{aiSummaryData?.data.data}</span>
+  }
+
   return (
     <Tooltip content="有新版本可用">
       <Button
         isIconOnly
         radius="full"
-        color="danger"
+        color="primary"
         variant="shadow"
         className="!w-5 !h-5 !min-w-0 text-small shadow-md"
         onPress={() => {
@@ -120,6 +158,13 @@ const NewVersionTip = (props: NewVersionTipProps) => {
                   <span>最新版本</span>
                   <Chip color="primary">{latestVersion}</Chip>
                 </div>
+                <div className="p-2 rounded-md bg-content2 text-sm">
+                  <div className="text-primary-400 font-bold flex items-center gap-1 mb-1">
+                    <BsStars />
+                    <span>AI总结</span>
+                  </div>
+                  {<AISummaryComponent />}
+                </div>
                 <div className="text-sm space-y-2 !mt-4">
                   {middleVersions.map((versionInfo) => (
                     <div
@@ -189,8 +234,8 @@ const SystemInfo: React.FC<SystemInfoProps> = (props) => {
     error: qqVersionError
   } = useRequest(WebUIManager.getQQVersion)
   return (
-    <Card className="bg-opacity-60 shadow-sm shadow-danger-50 dark:shadow-danger-100 overflow-visible flex-1">
-      <CardHeader className="pb-0 items-center gap-1 text-danger-500 font-extrabold">
+    <Card className="bg-opacity-60 shadow-sm shadow-primary-100 dark:shadow-primary-100 overflow-visible flex-1">
+      <CardHeader className="pb-0 items-center gap-1 text-primary-500 font-extrabold">
         <FaCircleInfo className="text-lg" />
         <span>系统信息</span>
       </CardHeader>

napcat.webui/src/components/system_status_display.tsx

@@ -24,7 +24,7 @@ const SystemStatusItem: React.FC<SystemStatusItemProps> = ({
   return (
     <div
       className={clsx(
-        'shadow-sm p-2 rounded-md text-sm bg-content1 bg-opacity-30',
+        'shadow-sm shadow-primary-100 p-2 rounded-md text-sm bg-content1 bg-opacity-30',
         size === 'lg' ? 'col-span-2' : 'col-span-1 flex justify-between'
       )}
     >
@@ -55,7 +55,7 @@ const SystemStatusDisplay: React.FC<SystemStatusDisplayProps> = ({ data }) => {
   }
 
   return (
-    <Card className="bg-opacity-60 shadow-sm shadow-danger-50 dark:shadow-danger-100 col-span-1 lg:col-span-2 relative overflow-hidden">
+    <Card className="bg-opacity-60 shadow-sm shadow-primary-100 col-span-1 lg:col-span-2 relative overflow-hidden">
       <div className="absolute h-full right-0 top-0">
         <Image
           src={bkg}
@@ -69,7 +69,7 @@ const SystemStatusDisplay: React.FC<SystemStatusDisplayProps> = ({ data }) => {
       </div>
       <CardBody className="overflow-visible md:flex-row gap-4 items-center justify-stretch z-10">
         <div className="flex-1 w-full md:max-w-96">
-          <h2 className="text-lg font-semibold flex items-center gap-1 text-danger-400">
+          <h2 className="text-lg font-semibold flex items-center gap-1 text-primary-400">
             <GiCpu className="text-xl" />
             <span>CPU</span>
           </h2>
@@ -88,7 +88,7 @@ const SystemStatusDisplay: React.FC<SystemStatusDisplayProps> = ({ data }) => {
               unit="%"
             />
           </div>
-          <h2 className="text-lg font-semibold flex items-center gap-1 text-danger-400 mt-2">
+          <h2 className="text-lg font-semibold flex items-center gap-1 text-primary-400 mt-2">
             <BiSolidMemoryCard className="text-xl" />
             <span>内存</span>
           </h2>

napcat.webui/src/components/tabs/index.tsx

@@ -62,7 +62,7 @@ export const Tab = forwardRef<HTMLDivElement, TabProps>(
         className={clsx(
           'px-2 py-1 flex items-center gap-1 text-sm font-medium border-b-2 transition-colors',
           isSelected
-            ? 'border-danger text-danger'
+            ? 'border-primary text-primary'
             : 'border-transparent hover:border-default',
           className
         )}

napcat.webui/src/const/themes.ts

@@ -0,0 +1,6 @@
+import heroui from './themes/heroui'
+import nc_pink from './themes/nc_pink'
+
+const themes: ThemeInfo[] = [nc_pink, heroui]
+
+export default themes

napcat.webui/src/const/themes/heroui.ts

@@ -0,0 +1,256 @@
+const theme: ThemeConfig = {
+  dark: {
+    '--heroui-background': '0 0% 0%',
+    '--heroui-foreground-50': '240 5.88% 10%',
+    '--heroui-foreground-100': '240 3.7% 15.88%',
+    '--heroui-foreground-200': '240 5.26% 26.08%',
+    '--heroui-foreground-300': '240 5.2% 33.92%',
+    '--heroui-foreground-400': '240 3.83% 46.08%',
+    '--heroui-foreground-500': '240 5.03% 64.9%',
+    '--heroui-foreground-600': '240 4.88% 83.92%',
+    '--heroui-foreground-700': '240 5.88% 90%',
+    '--heroui-foreground-800': '240 4.76% 95.88%',
+    '--heroui-foreground-900': '0 0% 98.04%',
+    '--heroui-foreground': '210 5.56% 92.94%',
+    '--heroui-focus': '212.01999999999998 100% 46.67%',
+    '--heroui-overlay': '0 0% 0%',
+    '--heroui-divider': '0 0% 100%',
+    '--heroui-divider-opacity': '0.15',
+    '--heroui-content1': '240 5.88% 10%',
+    '--heroui-content1-foreground': '0 0% 98.04%',
+    '--heroui-content2': '240 3.7% 15.88%',
+    '--heroui-content2-foreground': '240 4.76% 95.88%',
+    '--heroui-content3': '240 5.26% 26.08%',
+    '--heroui-content3-foreground': '240 5.88% 90%',
+    '--heroui-content4': '240 5.2% 33.92%',
+    '--heroui-content4-foreground': '240 4.88% 83.92%',
+    '--heroui-default-50': '240 5.88% 10%',
+    '--heroui-default-100': '240 3.7% 15.88%',
+    '--heroui-default-200': '240 5.26% 26.08%',
+    '--heroui-default-300': '240 5.2% 33.92%',
+    '--heroui-default-400': '240 3.83% 46.08%',
+    '--heroui-default-500': '240 5.03% 64.9%',
+    '--heroui-default-600': '240 4.88% 83.92%',
+    '--heroui-default-700': '240 5.88% 90%',
+    '--heroui-default-800': '240 4.76% 95.88%',
+    '--heroui-default-900': '0 0% 98.04%',
+    '--heroui-default-foreground': '0 0% 100%',
+    '--heroui-default': '240 5.26% 26.08%',
+    '--heroui-danger-50': '340 84.91% 10.39%',
+    '--heroui-danger-100': '339.33 86.54% 20.39%',
+    '--heroui-danger-200': '339.11 85.99% 30.78%',
+    '--heroui-danger-300': '339 86.54% 40.78%',
+    '--heroui-danger-400': '339.2 90.36% 51.18%',
+    '--heroui-danger-500': '339 90% 60.78%',
+    '--heroui-danger-600': '339.11 90.6% 70.78%',
+    '--heroui-danger-700': '339.33 90% 80.39%',
+    '--heroui-danger-800': '340 91.84% 90.39%',
+    '--heroui-danger-900': '339.13 92% 95.1%',
+    '--heroui-danger-foreground': '0 0% 100%',
+    '--heroui-danger': '339.2 90.36% 51.18%',
+    '--heroui-primary-50': '211.84 100% 9.61%',
+    '--heroui-primary-100': '211.84 100% 19.22%',
+    '--heroui-primary-200': '212.24 100% 28.82%',
+    '--heroui-primary-300': '212.14 100% 38.43%',
+    '--heroui-primary-400': '212.02 100% 46.67%',
+    '--heroui-primary-500': '212.14 92.45% 58.43%',
+    '--heroui-primary-600': '212.24 92.45% 68.82%',
+    '--heroui-primary-700': '211.84 92.45% 79.22%',
+    '--heroui-primary-800': '211.84 92.45% 89.61%',
+    '--heroui-primary-900': '212.5 92.31% 94.9%',
+    '--heroui-primary-foreground': '0 0% 100%',
+    '--heroui-primary': '212.02 100% 46.67%',
+    '--heroui-secondary-50': '270 66.67% 9.41%',
+    '--heroui-secondary-100': '270 66.67% 18.82%',
+    '--heroui-secondary-200': '270 66.67% 28.24%',
+    '--heroui-secondary-300': '270 66.67% 37.65%',
+    '--heroui-secondary-400': '270 66.67% 47.06%',
+    '--heroui-secondary-500': '270 59.26% 57.65%',
+    '--heroui-secondary-600': '270 59.26% 68.24%',
+    '--heroui-secondary-700': '270 59.26% 78.82%',
+    '--heroui-secondary-800': '270 59.26% 89.41%',
+    '--heroui-secondary-900': '270 61.54% 94.9%',
+    '--heroui-secondary-foreground': '0 0% 100%',
+    '--heroui-secondary': '270 59.26% 57.65%',
+    '--heroui-success-50': '145.71 77.78% 8.82%',
+    '--heroui-success-100': '146.2 79.78% 17.45%',
+    '--heroui-success-200': '145.79 79.26% 26.47%',
+    '--heroui-success-300': '146.01 79.89% 35.1%',
+    '--heroui-success-400': '145.96 79.46% 43.92%',
+    '--heroui-success-500': '146.01 62.45% 55.1%',
+    '--heroui-success-600': '145.79 62.57% 66.47%',
+    '--heroui-success-700': '146.2 61.74% 77.45%',
+    '--heroui-success-800': '145.71 61.4% 88.82%',
+    '--heroui-success-900': '146.67 64.29% 94.51%',
+    '--heroui-success-foreground': '0 0% 0%',
+    '--heroui-success': '145.96 79.46% 43.92%',
+    '--heroui-warning-50': '37.14 75% 10.98%',
+    '--heroui-warning-100': '37.14 75% 21.96%',
+    '--heroui-warning-200': '36.96 73.96% 33.14%',
+    '--heroui-warning-300': '37.01 74.22% 44.12%',
+    '--heroui-warning-400': '37.03 91.27% 55.1%',
+    '--heroui-warning-500': '37.01 91.26% 64.12%',
+    '--heroui-warning-600': '36.96 91.24% 73.14%',
+    '--heroui-warning-700': '37.14 91.3% 81.96%',
+    '--heroui-warning-800': '37.14 91.3% 90.98%',
+    '--heroui-warning-900': '54.55 91.67% 95.29%',
+    '--heroui-warning-foreground': '0 0% 0%',
+    '--heroui-warning': '37.03 91.27% 55.1%',
+    '--heroui-code-background': '240 5.56% 7.06%',
+    '--heroui-strong': '190.14 94.67% 44.12%',
+    '--heroui-code-mdx': '190.14 94.67% 44.12%',
+    '--heroui-divider-weight': '1px',
+    '--heroui-disabled-opacity': '.5',
+    '--heroui-font-size-tiny': '0.75rem',
+    '--heroui-font-size-small': '0.875rem',
+    '--heroui-font-size-medium': '1rem',
+    '--heroui-font-size-large': '1.125rem',
+    '--heroui-line-height-tiny': '1rem',
+    '--heroui-line-height-small': '1.25rem',
+    '--heroui-line-height-medium': '1.5rem',
+    '--heroui-line-height-large': '1.75rem',
+    '--heroui-radius-small': '8px',
+    '--heroui-radius-medium': '12px',
+    '--heroui-radius-large': '14px',
+    '--heroui-border-width-small': '1px',
+    '--heroui-border-width-medium': '2px',
+    '--heroui-border-width-large': '3px',
+    '--heroui-box-shadow-small':
+      '0px 0px 5px 0px rgba(0, 0, 0, .05), 0px 2px 10px 0px rgba(0, 0, 0, .2), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-box-shadow-medium':
+      '0px 0px 15px 0px rgba(0, 0, 0, .06), 0px 2px 30px 0px rgba(0, 0, 0, .22), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-box-shadow-large':
+      '0px 0px 30px 0px rgba(0, 0, 0, .07), 0px 30px 60px 0px rgba(0, 0, 0, .26), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-hover-opacity': '.9'
+  },
+  light: {
+    '--heroui-background': '0 0% 100%',
+    '--heroui-foreground-50': '240 5.88% 95%',
+    '--heroui-foreground-100': '240 3.7% 90%',
+    '--heroui-foreground-200': '240 5.26% 80%',
+    '--heroui-foreground-300': '240 5.2% 70%',
+    '--heroui-foreground-400': '240 3.83% 60%',
+    '--heroui-foreground-500': '240 5.03% 50%',
+    '--heroui-foreground-600': '240 4.88% 40%',
+    '--heroui-foreground-700': '240 5.88% 30%',
+    '--heroui-foreground-800': '240 4.76% 20%',
+    '--heroui-foreground-900': '0 0% 10%',
+    '--heroui-foreground': '210 5.56% 7.06%',
+    '--heroui-focus': '212.01999999999998 100% 53.33%',
+    '--heroui-overlay': '0 0% 100%',
+    '--heroui-divider': '0 0% 0%',
+    '--heroui-divider-opacity': '0.85',
+    '--heroui-content1': '240 5.88% 95%',
+    '--heroui-content1-foreground': '0 0% 10%',
+    '--heroui-content2': '240 3.7% 90%',
+    '--heroui-content2-foreground': '240 4.76% 20%',
+    '--heroui-content3': '240 5.26% 80%',
+    '--heroui-content3-foreground': '240 5.88% 30%',
+    '--heroui-content4': '240 5.2% 70%',
+    '--heroui-content4-foreground': '240 4.88% 40%',
+    '--heroui-default-50': '240 5.88% 95%',
+    '--heroui-default-100': '240 3.7% 90%',
+    '--heroui-default-200': '240 5.26% 80%',
+    '--heroui-default-300': '240 5.2% 70%',
+    '--heroui-default-400': '240 3.83% 60%',
+    '--heroui-default-500': '240 5.03% 50%',
+    '--heroui-default-600': '240 4.88% 40%',
+    '--heroui-default-700': '240 5.88% 30%',
+    '--heroui-default-800': '240 4.76% 20%',
+    '--heroui-default-900': '0 0% 10%',
+    '--heroui-default-foreground': '0 0% 0%',
+    '--heroui-default': '240 5.26% 80%',
+    '--heroui-danger-50': '339.13 92% 95.1%',
+    '--heroui-danger-100': '340 91.84% 90.39%',
+    '--heroui-danger-200': '339.33 90% 80.39%',
+    '--heroui-danger-300': '339.11 90.6% 70.78%',
+    '--heroui-danger-400': '339 90% 60.78%',
+    '--heroui-danger-500': '339.2 90.36% 51.18%',
+    '--heroui-danger-600': '339 86.54% 40.78%',
+    '--heroui-danger-700': '339.11 85.99% 30.78%',
+    '--heroui-danger-800': '339.33 86.54% 20.39%',
+    '--heroui-danger-900': '340 84.91% 10.39%',
+    '--heroui-danger-foreground': '0 0% 100%',
+    '--heroui-danger': '339.2 90.36% 51.18%',
+    '--heroui-primary-50': '212.5 92.31% 94.9%',
+    '--heroui-primary-100': '211.84 92.45% 89.61%',
+    '--heroui-primary-200': '211.84 92.45% 79.22%',
+    '--heroui-primary-300': '212.24 92.45% 68.82%',
+    '--heroui-primary-400': '212.14 92.45% 58.43%',
+    '--heroui-primary-500': '212.02 100% 46.67%',
+    '--heroui-primary-600': '212.14 100% 38.43%',
+    '--heroui-primary-700': '212.24 100% 28.82%',
+    '--heroui-primary-800': '211.84 100% 19.22%',
+    '--heroui-primary-900': '211.84 100% 9.61%',
+    '--heroui-primary-foreground': '0 0% 100%',
+    '--heroui-primary': '212.02 100% 46.67%',
+    '--heroui-secondary-50': '270 61.54% 94.9%',
+    '--heroui-secondary-100': '270 59.26% 89.41%',
+    '--heroui-secondary-200': '270 59.26% 78.82%',
+    '--heroui-secondary-300': '270 59.26% 68.24%',
+    '--heroui-secondary-400': '270 59.26% 57.65%',
+    '--heroui-secondary-500': '270 66.67% 47.06%',
+    '--heroui-secondary-600': '270 66.67% 37.65%',
+    '--heroui-secondary-700': '270 66.67% 28.24%',
+    '--heroui-secondary-800': '270 66.67% 18.82%',
+    '--heroui-secondary-900': '270 66.67% 9.41%',
+    '--heroui-secondary-foreground': '0 0% 100%',
+    '--heroui-secondary': '270 66.67% 47.06%',
+    '--heroui-success-50': '146.67 64.29% 94.51%',
+    '--heroui-success-100': '145.71 61.4% 88.82%',
+    '--heroui-success-200': '146.2 61.74% 77.45%',
+    '--heroui-success-300': '145.79 62.57% 66.47%',
+    '--heroui-success-400': '146.01 62.45% 55.1%',
+    '--heroui-success-500': '145.96 79.46% 43.92%',
+    '--heroui-success-600': '146.01 79.89% 35.1%',
+    '--heroui-success-700': '145.79 79.26% 26.47%',
+    '--heroui-success-800': '146.2 79.78% 17.45%',
+    '--heroui-success-900': '145.71 77.78% 8.82%',
+    '--heroui-success-foreground': '0 0% 0%',
+    '--heroui-success': '145.96 79.46% 43.92%',
+    '--heroui-warning-50': '54.55 91.67% 95.29%',
+    '--heroui-warning-100': '37.14 91.3% 90.98%',
+    '--heroui-warning-200': '37.14 91.3% 81.96%',
+    '--heroui-warning-300': '36.96 91.24% 73.14%',
+    '--heroui-warning-400': '37.01 91.26% 64.12%',
+    '--heroui-warning-500': '37.03 91.27% 55.1%',
+    '--heroui-warning-600': '37.01 74.22% 44.12%',
+    '--heroui-warning-700': '36.96 73.96% 33.14%',
+    '--heroui-warning-800': '37.14 75% 21.96%',
+    '--heroui-warning-900': '37.14 75% 10.98%',
+    '--heroui-warning-foreground': '0 0% 0%',
+    '--heroui-warning': '37.03 91.27% 55.1%',
+    '--heroui-code-background': '221.25 17.39% 18.04%',
+    '--heroui-strong': '316.95 100% 65.29%',
+    '--heroui-code-mdx': '316.95 100% 65.29%',
+    '--heroui-divider-weight': '1px',
+    '--heroui-disabled-opacity': '.5',
+    '--heroui-font-size-tiny': '0.75rem',
+    '--heroui-font-size-small': '0.875rem',
+    '--heroui-font-size-medium': '1rem',
+    '--heroui-font-size-large': '1.125rem',
+    '--heroui-line-height-tiny': '1rem',
+    '--heroui-line-height-small': '1.25rem',
+    '--heroui-line-height-medium': '1.5rem',
+    '--heroui-line-height-large': '1.75rem',
+    '--heroui-radius-small': '8px',
+    '--heroui-radius-medium': '12px',
+    '--heroui-radius-large': '14px',
+    '--heroui-border-width-small': '1px',
+    '--heroui-border-width-medium': '2px',
+    '--heroui-border-width-large': '3px',
+    '--heroui-box-shadow-small':
+      '0px 0px 5px 0px rgba(0, 0, 0, .02), 0px 2px 10px 0px rgba(0, 0, 0, .06), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-box-shadow-medium':
+      '0px 0px 15px 0px rgba(0, 0, 0, .03), 0px 2px 30px 0px rgba(0, 0, 0, .08), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-box-shadow-large':
+      '0px 0px 30px 0px rgba(0, 0, 0, .04), 0px 30px 60px 0px rgba(0, 0, 0, .12), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-hover-opacity': '.8'
+  }
+}
+export default {
+  theme,
+  author: 'HeroUI',
+  name: 'heroui',
+  description: 'HeroUI Default Theme'
+} satisfies ThemeInfo

napcat.webui/src/const/themes/nc_pink.ts

@@ -0,0 +1,256 @@
+const theme: ThemeConfig = {
+  dark: {
+    '--heroui-background': '0 0% 0%',
+    '--heroui-foreground-50': '240 5.88% 10%',
+    '--heroui-foreground-100': '240 3.7% 15.88%',
+    '--heroui-foreground-200': '240 5.26% 26.08%',
+    '--heroui-foreground-300': '240 5.2% 33.92%',
+    '--heroui-foreground-400': '240 3.83% 46.08%',
+    '--heroui-foreground-500': '240 5.03% 64.9%',
+    '--heroui-foreground-600': '240 4.88% 83.92%',
+    '--heroui-foreground-700': '240 5.88% 90%',
+    '--heroui-foreground-800': '240 4.76% 95.88%',
+    '--heroui-foreground-900': '0 0% 98.04%',
+    '--heroui-foreground': '210 5.56% 92.94%',
+    '--heroui-focus': '212.01999999999998 100% 46.67%',
+    '--heroui-overlay': '0 0% 0%',
+    '--heroui-divider': '0 0% 100%',
+    '--heroui-divider-opacity': '0.15',
+    '--heroui-content1': '240 5.88% 10%',
+    '--heroui-content1-foreground': '0 0% 98.04%',
+    '--heroui-content2': '240 3.7% 15.88%',
+    '--heroui-content2-foreground': '240 4.76% 95.88%',
+    '--heroui-content3': '240 5.26% 26.08%',
+    '--heroui-content3-foreground': '240 5.88% 90%',
+    '--heroui-content4': '240 5.2% 33.92%',
+    '--heroui-content4-foreground': '240 4.88% 83.92%',
+    '--heroui-default-50': '240 5.88% 10%',
+    '--heroui-default-100': '240 3.7% 15.88%',
+    '--heroui-default-200': '240 5.26% 26.08%',
+    '--heroui-default-300': '240 5.2% 33.92%',
+    '--heroui-default-400': '240 3.83% 46.08%',
+    '--heroui-default-500': '240 5.03% 64.9%',
+    '--heroui-default-600': '240 4.88% 83.92%',
+    '--heroui-default-700': '240 5.88% 90%',
+    '--heroui-default-800': '240 4.76% 95.88%',
+    '--heroui-default-900': '0 0% 98.04%',
+    '--heroui-default-foreground': '0 0% 100%',
+    '--heroui-default': '240 5.26% 26.08%',
+    '--heroui-danger-50': '301.89 82.61% 22.55%',
+    '--heroui-danger-100': '308.18 76.39% 28.24%',
+    '--heroui-danger-200': '313.85 70.65% 36.08%',
+    '--heroui-danger-300': '319.73 65.64% 44.51%',
+    '--heroui-danger-400': '325.82 69.62% 53.53%',
+    '--heroui-danger-500': '331.82 75% 65.49%',
+    '--heroui-danger-600': '337.84 83.46% 73.92%',
+    '--heroui-danger-700': '343.42 90.48% 83.53%',
+    '--heroui-danger-800': '350.53 90.48% 91.76%',
+    '--heroui-danger-900': '324 90.91% 95.69%',
+    '--heroui-danger-foreground': '0 0% 100%',
+    '--heroui-danger': '325.82 69.62% 53.53%',
+    '--heroui-primary-50': '340 84.91% 10.39%',
+    '--heroui-primary-100': '339.33 86.54% 20.39%',
+    '--heroui-primary-200': '339.11 85.99% 30.78%',
+    '--heroui-primary-300': '339 86.54% 40.78%',
+    '--heroui-primary-400': '339.2 90.36% 51.18%',
+    '--heroui-primary-500': '339 90% 60.78%',
+    '--heroui-primary-600': '339.11 90.6% 70.78%',
+    '--heroui-primary-700': '339.33 90% 80.39%',
+    '--heroui-primary-800': '340 91.84% 90.39%',
+    '--heroui-primary-900': '339.13 92% 95.1%',
+    '--heroui-primary-foreground': '0 0% 100%',
+    '--heroui-primary': '339.2 90.36% 51.18%',
+    '--heroui-secondary-50': '270 66.67% 9.41%',
+    '--heroui-secondary-100': '270 66.67% 18.82%',
+    '--heroui-secondary-200': '270 66.67% 28.24%',
+    '--heroui-secondary-300': '270 66.67% 37.65%',
+    '--heroui-secondary-400': '270 66.67% 47.06%',
+    '--heroui-secondary-500': '270 59.26% 57.65%',
+    '--heroui-secondary-600': '270 59.26% 68.24%',
+    '--heroui-secondary-700': '270 59.26% 78.82%',
+    '--heroui-secondary-800': '270 59.26% 89.41%',
+    '--heroui-secondary-900': '270 61.54% 94.9%',
+    '--heroui-secondary-foreground': '0 0% 100%',
+    '--heroui-secondary': '270 59.26% 57.65%',
+    '--heroui-success-50': '145.71 77.78% 8.82%',
+    '--heroui-success-100': '146.2 79.78% 17.45%',
+    '--heroui-success-200': '145.79 79.26% 26.47%',
+    '--heroui-success-300': '146.01 79.89% 35.1%',
+    '--heroui-success-400': '145.96 79.46% 43.92%',
+    '--heroui-success-500': '146.01 62.45% 55.1%',
+    '--heroui-success-600': '145.79 62.57% 66.47%',
+    '--heroui-success-700': '146.2 61.74% 77.45%',
+    '--heroui-success-800': '145.71 61.4% 88.82%',
+    '--heroui-success-900': '146.67 64.29% 94.51%',
+    '--heroui-success-foreground': '0 0% 0%',
+    '--heroui-success': '145.96 79.46% 43.92%',
+    '--heroui-warning-50': '37.14 75% 10.98%',
+    '--heroui-warning-100': '37.14 75% 21.96%',
+    '--heroui-warning-200': '36.96 73.96% 33.14%',
+    '--heroui-warning-300': '37.01 74.22% 44.12%',
+    '--heroui-warning-400': '37.03 91.27% 55.1%',
+    '--heroui-warning-500': '37.01 91.26% 64.12%',
+    '--heroui-warning-600': '36.96 91.24% 73.14%',
+    '--heroui-warning-700': '37.14 91.3% 81.96%',
+    '--heroui-warning-800': '37.14 91.3% 90.98%',
+    '--heroui-warning-900': '54.55 91.67% 95.29%',
+    '--heroui-warning-foreground': '0 0% 0%',
+    '--heroui-warning': '37.03 91.27% 55.1%',
+    '--heroui-code-background': '240 5.56% 7.06%',
+    '--heroui-strong': '190.14 94.67% 44.12%',
+    '--heroui-code-mdx': '190.14 94.67% 44.12%',
+    '--heroui-divider-weight': '1px',
+    '--heroui-disabled-opacity': '.5',
+    '--heroui-font-size-tiny': '0.75rem',
+    '--heroui-font-size-small': '0.875rem',
+    '--heroui-font-size-medium': '1rem',
+    '--heroui-font-size-large': '1.125rem',
+    '--heroui-line-height-tiny': '1rem',
+    '--heroui-line-height-small': '1.25rem',
+    '--heroui-line-height-medium': '1.5rem',
+    '--heroui-line-height-large': '1.75rem',
+    '--heroui-radius-small': '8px',
+    '--heroui-radius-medium': '12px',
+    '--heroui-radius-large': '14px',
+    '--heroui-border-width-small': '1px',
+    '--heroui-border-width-medium': '2px',
+    '--heroui-border-width-large': '3px',
+    '--heroui-box-shadow-small':
+      '0px 0px 5px 0px rgba(0, 0, 0, .05), 0px 2px 10px 0px rgba(0, 0, 0, .2), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-box-shadow-medium':
+      '0px 0px 15px 0px rgba(0, 0, 0, .06), 0px 2px 30px 0px rgba(0, 0, 0, .22), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-box-shadow-large':
+      '0px 0px 30px 0px rgba(0, 0, 0, .07), 0px 30px 60px 0px rgba(0, 0, 0, .26), inset 0px 0px 1px 0px hsla(0, 0%, 100%, .15)',
+    '--heroui-hover-opacity': '.9'
+  },
+  light: {
+    '--heroui-background': '0 0% 100%',
+    '--heroui-foreground-50': '240 5.88% 95%',
+    '--heroui-foreground-100': '240 3.7% 90%',
+    '--heroui-foreground-200': '240 5.26% 80%',
+    '--heroui-foreground-300': '240 5.2% 70%',
+    '--heroui-foreground-400': '240 3.83% 60%',
+    '--heroui-foreground-500': '240 5.03% 50%',
+    '--heroui-foreground-600': '240 4.88% 40%',
+    '--heroui-foreground-700': '240 5.88% 30%',
+    '--heroui-foreground-800': '240 4.76% 20%',
+    '--heroui-foreground-900': '0 0% 10%',
+    '--heroui-foreground': '210 5.56% 7.06%',
+    '--heroui-focus': '212.01999999999998 100% 53.33%',
+    '--heroui-overlay': '0 0% 100%',
+    '--heroui-divider': '0 0% 0%',
+    '--heroui-divider-opacity': '0.85',
+    '--heroui-content1': '240 5.88% 95%',
+    '--heroui-content1-foreground': '0 0% 10%',
+    '--heroui-content2': '240 3.7% 90%',
+    '--heroui-content2-foreground': '240 4.76% 20%',
+    '--heroui-content3': '240 5.26% 80%',
+    '--heroui-content3-foreground': '240 5.88% 30%',
+    '--heroui-content4': '240 5.2% 70%',
+    '--heroui-content4-foreground': '240 4.88% 40%',
+    '--heroui-default-50': '240 5.88% 95%',
+    '--heroui-default-100': '240 3.7% 90%',
+    '--heroui-default-200': '240 5.26% 80%',
+    '--heroui-default-300': '240 5.2% 70%',
+    '--heroui-default-400': '240 3.83% 60%',
+    '--heroui-default-500': '240 5.03% 50%',
+    '--heroui-default-600': '240 4.88% 40%',
+    '--heroui-default-700': '240 5.88% 30%',
+    '--heroui-default-800': '240 4.76% 20%',
+    '--heroui-default-900': '0 0% 10%',
+    '--heroui-default-foreground': '0 0% 0%',
+    '--heroui-default': '240 5.26% 80%',
+    '--heroui-danger-50': '324 90.91% 95.69%',
+    '--heroui-danger-100': '350.53 90.48% 91.76%',
+    '--heroui-danger-200': '343.42 90.48% 83.53%',
+    '--heroui-danger-300': '337.84 83.46% 73.92%',
+    '--heroui-danger-400': '331.82 75% 65.49%',
+    '--heroui-danger-500': '325.82 69.62% 53.53%',
+    '--heroui-danger-600': '319.73 65.64% 44.51%',
+    '--heroui-danger-700': '313.85 70.65% 36.08%',
+    '--heroui-danger-800': '308.18 76.39% 28.24%',
+    '--heroui-danger-900': '301.89 82.61% 22.55%',
+    '--heroui-danger-foreground': '0 0% 100%',
+    '--heroui-danger': '325.82 69.62% 53.53%',
+    '--heroui-primary-50': '339.13 92% 95.1%',
+    '--heroui-primary-100': '340 91.84% 90.39%',
+    '--heroui-primary-200': '339.33 90% 80.39%',
+    '--heroui-primary-300': '339.11 90.6% 70.78%',
+    '--heroui-primary-400': '339 90% 60.78%',
+    '--heroui-primary-500': '339.2 90.36% 51.18%',
+    '--heroui-primary-600': '339 86.54% 40.78%',
+    '--heroui-primary-700': '339.11 85.99% 30.78%',
+    '--heroui-primary-800': '339.33 86.54% 20.39%',
+    '--heroui-primary-900': '340 84.91% 10.39%',
+    '--heroui-primary-foreground': '0 0% 100%',
+    '--heroui-primary': '339.2 90.36% 51.18%',
+    '--heroui-secondary-50': '270 61.54% 94.9%',
+    '--heroui-secondary-100': '270 59.26% 89.41%',
+    '--heroui-secondary-200': '270 59.26% 78.82%',
+    '--heroui-secondary-300': '270 59.26% 68.24%',
+    '--heroui-secondary-400': '270 59.26% 57.65%',
+    '--heroui-secondary-500': '270 66.67% 47.06%',
+    '--heroui-secondary-600': '270 66.67% 37.65%',
+    '--heroui-secondary-700': '270 66.67% 28.24%',
+    '--heroui-secondary-800': '270 66.67% 18.82%',
+    '--heroui-secondary-900': '270 66.67% 9.41%',
+    '--heroui-secondary-foreground': '0 0% 100%',
+    '--heroui-secondary': '270 66.67% 47.06%',
+    '--heroui-success-50': '146.67 64.29% 94.51%',
+    '--heroui-success-100': '145.71 61.4% 88.82%',
+    '--heroui-success-200': '146.2 61.74% 77.45%',
+    '--heroui-success-300': '145.79 62.57% 66.47%',
+    '--heroui-success-400': '146.01 62.45% 55.1%',
+    '--heroui-success-500': '145.96 79.46% 43.92%',
+    '--heroui-success-600': '146.01 79.89% 35.1%',
+    '--heroui-success-700': '145.79 79.26% 26.47%',
+    '--heroui-success-800': '146.2 79.78% 17.45%',
+    '--heroui-success-900': '145.71 77.78% 8.82%',
+    '--heroui-success-foreground': '0 0% 0%',
+    '--heroui-success': '145.96 79.46% 43.92%',
+    '--heroui-warning-50': '54.55 91.67% 95.29%',
+    '--heroui-warning-100': '37.14 91.3% 90.98%',
+    '--heroui-warning-200': '37.14 91.3% 81.96%',
+    '--heroui-warning-300': '36.96 91.24% 73.14%',
+    '--heroui-warning-400': '37.01 91.26% 64.12%',
+    '--heroui-warning-500': '37.03 91.27% 55.1%',
+    '--heroui-warning-600': '37.01 74.22% 44.12%',
+    '--heroui-warning-700': '36.96 73.96% 33.14%',
+    '--heroui-warning-800': '37.14 75% 21.96%',
+    '--heroui-warning-900': '37.14 75% 10.98%',
+    '--heroui-warning-foreground': '0 0% 0%',
+    '--heroui-warning': '37.03 91.27% 55.1%',
+    '--heroui-code-background': '221.25 17.39% 18.04%',
+    '--heroui-strong': '316.95 100% 65.29%',
+    '--heroui-code-mdx': '316.95 100% 65.29%',
+    '--heroui-divider-weight': '1px',
+    '--heroui-disabled-opacity': '.5',
+    '--heroui-font-size-tiny': '0.75rem',
+    '--heroui-font-size-small': '0.875rem',
+    '--heroui-font-size-medium': '1rem',
+    '--heroui-font-size-large': '1.125rem',
+    '--heroui-line-height-tiny': '1rem',
+    '--heroui-line-height-small': '1.25rem',
+    '--heroui-line-height-medium': '1.5rem',
+    '--heroui-line-height-large': '1.75rem',
+    '--heroui-radius-small': '8px',
+    '--heroui-radius-medium': '12px',
+    '--heroui-radius-large': '14px',
+    '--heroui-border-width-small': '1px',
+    '--heroui-border-width-medium': '2px',
+    '--heroui-border-width-large': '3px',
+    '--heroui-box-shadow-small':
+      '0px 0px 5px 0px rgba(0, 0, 0, .02), 0px 2px 10px 0px rgba(0, 0, 0, .06), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-box-shadow-medium':
+      '0px 0px 15px 0px rgba(0, 0, 0, .03), 0px 2px 30px 0px rgba(0, 0, 0, .08), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-box-shadow-large':
+      '0px 0px 30px 0px rgba(0, 0, 0, .04), 0px 30px 60px 0px rgba(0, 0, 0, .12), 0px 0px 1px 0px rgba(0, 0, 0, .3)',
+    '--heroui-hover-opacity': '.8'
+  }
+}
+export default {
+  theme,
+  author: 'NapCat',
+  name: 'nc_pink',
+  description: 'NapCat Pink Theme'
+} satisfies ThemeInfo

napcat.webui/src/contexts/songs.tsx

@@ -35,6 +35,7 @@ const AudioProvider: React.FC<MusicProviderProps> = ({ children }) => {
   const [musicId, setMusicId] = useState<number>(0)
   const [playMode, setPlayMode] = useState<PlayMode>(PlayMode.Loop)
   const music = musicList.find((music) => music.id === musicId)
+  const [token] = useLocalStorage(key.token, '')
   const onNext = () => {
     const nextID = getNextMusic(musicList, musicId, playMode)
     setMusicId(nextID)
@@ -60,8 +61,8 @@ const AudioProvider: React.FC<MusicProviderProps> = ({ children }) => {
     setMusicId(res[0].id)
   }
   useEffect(() => {
-    fetchMusicList(listId)
-  }, [listId])
+    if (listId && token) fetchMusicList(listId)
+  }, [listId, token])
   return (
     <AudioContext.Provider
       value={{

napcat.webui/src/controllers/file_manager.ts

@@ -196,4 +196,26 @@ export default class FileManager {
     )
     return data.data
   }
+
+  public static async uploadWebUIFont(file: File) {
+    const formData = new FormData()
+    formData.append('file', file)
+    const { data } = await serverRequest.post<ServerResponse<boolean>>(
+      '/File/font/upload/webui',
+      formData,
+      {
+        headers: {
+          'Content-Type': 'multipart/form-data'
+        }
+      }
+    )
+    return data.data
+  }
+
+  public static async deleteWebUIFont() {
+    const { data } = await serverRequest.post<ServerResponse<boolean>>(
+      '/File/font/delete/webui'
+    )
+    return data.data
+  }
 }

napcat.webui/src/controllers/qq_manager.ts

@@ -73,4 +73,17 @@ export default class QQManager {
     )
     return data.data.data
   }
+
+  public static async getQuickLoginQQ() {
+    const { data } = await serverRequest.post<ServerResponse<string>>(
+      '/QQLogin/GetQuickLoginQQ'
+    )
+    return data.data
+  }
+
+  public static async setQuickLoginQQ(uin: string) {
+    await serverRequest.post<ServerResponse<null>>('/QQLogin/SetQuickLoginQQ', {
+      uin
+    })
+  }
 }

napcat.webui/src/controllers/webui_manager.ts

@@ -9,14 +9,6 @@ export interface Log {
   message: string
 }
 
-export interface TerminalSession {
-  id: string
-}
-
-export interface TerminalInfo {
-  id: string
-}
-
 export default class WebUIManager {
   public static async checkWebUiLogined() {
     const { data } =
@@ -40,6 +32,13 @@ export default class WebUIManager {
     return data.data
   }
 
+  public static async checkUsingDefaultToken() {
+    const { data } = await serverRequest.get<ServerResponse<boolean>>(
+      '/auth/check_using_default_token'
+    )
+    return data.data
+  }
+
   public static async proxy<T>(url = '') {
     const data = await serverRequest.get<ServerResponse<string>>(
       '/base/proxy?url=' + encodeURIComponent(url)
@@ -60,6 +59,20 @@ export default class WebUIManager {
     return data.data
   }
 
+  public static async getThemeConfig() {
+    const { data } =
+      await serverRequest.get<ServerResponse<ThemeConfig>>('/base/Theme')
+    return data.data
+  }
+
+  public static async setThemeConfig(theme: ThemeConfig) {
+    const { data } = await serverRequest.post<ServerResponse<boolean>>(
+      '/base/SetTheme',
+      { theme }
+    )
+    return data.data
+  }
+
   public static async getLogList() {
     const { data } =
       await serverRequest.get<ServerResponse<string[]>>('/Log/GetLogList')

napcat.webui/src/layouts/default.tsx

@@ -79,7 +79,7 @@ const Layout: React.FC<{ children: React.ReactNode }> = ({ children }) => {
   }, [location.pathname])
   return (
     <div
-      className="h-screen relative flex bg-danger-50 dark:bg-black items-stretch"
+      className="h-screen relative flex bg-primary-50 dark:bg-black items-stretch"
       style={{
         backgroundImage: `url(${b64img})`,
         backgroundSize: 'cover'
@@ -99,9 +99,9 @@ const Layout: React.FC<{ children: React.ReactNode }> = ({ children }) => {
         <div
           className={clsx(
             'h-10 flex items-center font-bold text-xl backdrop-blur-lg rounded-full',
-            'dark:bg-background dark:shadow-danger-100',
+            'dark:bg-background dark:shadow-primary-100',
             'bg-background !bg-opacity-50',
-            'shadow-sm shadow-danger-50',
+            'shadow-sm shadow-primary-50',
             'z-30 m-2 mb-0 sticky top-2 left-0'
           )}
         >

napcat.webui/src/main.tsx

@@ -8,6 +8,7 @@ import '@/styles/globals.css'
 
 import key from './const/key'
 import WebUIManager from './controllers/webui_manager'
+import { loadTheme } from './utils/theme'
 
 WebUIManager.checkWebUiLogined()
 
@@ -22,6 +23,8 @@ if (theme && !theme.startsWith('"')) {
   localStorage.setItem(key.theme, JSON.stringify(theme))
 }
 
+loadTheme()
+
 ReactDOM.createRoot(document.getElementById('root')!).render(
   // <React.StrictMode>
   <BrowserRouter basename="/webui/">

napcat.webui/src/pages/dashboard/about.tsx

@@ -1,6 +1,7 @@
 import { Card, CardBody } from '@heroui/card'
 import { Image } from '@heroui/image'
 import { Link } from '@heroui/link'
+import { Skeleton } from '@heroui/skeleton'
 import { Spinner } from '@heroui/spinner'
 import { useRequest } from 'ahooks'
 import { useMemo } from 'react'
@@ -22,7 +23,7 @@ function VersionInfo() {
   return (
     <div className="flex items-center gap-2 text-2xl font-bold">
       <div className="flex items-center gap-2">
-        <div className="text-danger-500 drop-shadow-md">NapCat</div>
+        <div className="text-primary-500 drop-shadow-md">NapCat</div>
         {error ? (
           error.message
         ) : loading ? (
@@ -30,7 +31,7 @@ function VersionInfo() {
         ) : (
           <RotatingText
             texts={['WebUI', data?.version ?? '']}
-            mainClassName="overflow-hidden flex items-center bg-danger-500 px-2 rounded-lg text-default-50 shadow-md"
+            mainClassName="overflow-hidden flex items-center bg-primary-500 px-2 rounded-lg text-default-50 shadow-md"
             staggerFrom={'last'}
             initial={{ y: '100%' }}
             animate={{ y: 0 }}
@@ -78,16 +79,12 @@ export default function AboutPage() {
       const imageUrl = getImageUrl(baseUrl)
 
       if (!imageUrl) {
-        return (
-          <div className="flex-1 h-32 flex items-center justify-center bg-default-100 rounded-lg">
-            <Spinner />
-          </div>
-        )
+        return <Skeleton className="h-16 rounded-lg" />
       }
 
       return (
         <Image
-          className="flex-1 pointer-events-none select-none"
+          className="flex-1 pointer-events-none select-none rounded-none"
           src={imageUrl}
           alt={alt}
         />
@@ -107,12 +104,12 @@ export default function AboutPage() {
           <div className="flex-1 flex flex-col gap-2 py-2">
             <VersionInfo />
             <div className="space-y-1">
-              <p className="font-bold text-danger-400">NapCat 是什么?</p>
+              <p className="font-bold text-primary-400">NapCat 是什么?</p>
               <p className="text-default-800">
                 基于TypeScript构建的Bot框架,通过相应的启动器或者框架,主动调用QQ
                 Node模块提供给客户端的接口,实现Bot的功能.
               </p>
-              <p className="font-bold text-danger-400">魔法版介绍</p>
+              <p className="font-bold text-primary-400">魔法版介绍</p>
               <p className="text-default-800">
                 猫猫框架通过魔法的手段获得了 QQ 的发送消息、接收消息等接口。
                 为了方便使用，猫猫框架将通过一种名为 OneBot 的约定将你的 HTTP /
@@ -131,7 +128,7 @@ export default function AboutPage() {
             href="https://qm.qq.com/q/F9cgs1N3Mc"
           >
             <CardBody className="flex-row items-center gap-2">
-              <span className="p-2 rounded-small bg-primary-50">
+              <span className="p-2 rounded-small bg-primary-50 text-primary-500">
                 <BsTencentQq size={16} />
               </span>
               <span>官方社群1</span>
@@ -146,7 +143,7 @@ export default function AboutPage() {
             href="https://qm.qq.com/q/hSt0u9PVn"
           >
             <CardBody className="flex-row items-center gap-2">
-              <span className="p-2 rounded-small bg-primary-50">
+              <span className="p-2 rounded-small bg-primary-50 text-primary-500">
                 <BsTencentQq size={16} />
               </span>
               <span>官方社群2</span>
@@ -161,7 +158,7 @@ export default function AboutPage() {
             href="https://t.me/MelodicMoonlight"
           >
             <CardBody className="flex-row items-center gap-2">
-              <span className="p-2 rounded-small bg-primary-50">
+              <span className="p-2 rounded-small bg-primary-50 text-primary-500">
                 <BsTelegram size={16} />
               </span>
               <span>Telegram</span>
@@ -176,7 +173,7 @@ export default function AboutPage() {
             href="https://napcat.napneko.icu/"
           >
             <CardBody className="flex-row items-center gap-2">
-              <span className="p-2 rounded-small bg-primary-50">
+              <span className="p-2 rounded-small bg-primary-50 text-primary-500">
                 <IoDocument size={16} />
               </span>
               <span>使用文档</span>

napcat.webui/src/pages/dashboard/config/index.tsx

@@ -1,20 +1,36 @@
 import { Card, CardBody } from '@heroui/card'
 import { Tab, Tabs } from '@heroui/tabs'
+import clsx from 'clsx'
 import { useMediaQuery } from 'react-responsive'
+import { useNavigate, useSearchParams } from 'react-router-dom'
 
 import ChangePasswordCard from './change_password'
+import LoginConfigCard from './login'
 import OneBotConfigCard from './onebot'
+import ThemeConfigCard from './theme'
 import WebUIConfigCard from './webui'
 
 export interface ConfigPageProps {
   children?: React.ReactNode
+  size?: 'sm' | 'md' | 'lg'
 }
 
-const ConfingPageItem: React.FC<ConfigPageProps> = ({ children }) => {
+const ConfingPageItem: React.FC<ConfigPageProps> = ({
+  children,
+  size = 'md'
+}) => {
   return (
     <Card className="bg-opacity-50 backdrop-blur-sm">
       <CardBody className="items-center py-5">
-        <div className="w-96 max-w-full flex flex-col gap-2">{children}</div>
+        <div
+          className={clsx('max-w-full flex flex-col gap-2', {
+            'w-72': size === 'sm',
+            'w-96': size === 'md',
+            'w-[32rem]': size === 'lg'
+          })}
+        >
+          {children}
+        </div>
       </CardBody>
     </Card>
   )
@@ -22,6 +38,11 @@ const ConfingPageItem: React.FC<ConfigPageProps> = ({ children }) => {
 
 export default function ConfigPage() {
   const isMediumUp = useMediaQuery({ minWidth: 768 })
+  const navigate = useNavigate()
+  const search = useSearchParams({
+    tab: 'onebot'
+  })[0]
+  const tab = search.get('tab') ?? 'onebot'
 
   return (
     <section className="w-[1000px] max-w-full md:mx-auto gap-4 py-8 px-2 md:py-10">
@@ -30,6 +51,10 @@ export default function ConfigPage() {
         fullWidth
         className="w-full"
         isVertical={isMediumUp}
+        selectedKey={tab}
+        onSelectionChange={(key) => {
+          navigate(`/config?tab=${key}`)
+        }}
         classNames={{
           tabList: 'sticky flex top-14 bg-opacity-50 backdrop-blur-sm',
           panel: 'w-full relative',
@@ -47,12 +72,22 @@ export default function ConfigPage() {
             <WebUIConfigCard />
           </ConfingPageItem>
         </Tab>
-
+        <Tab title="登录配置" key="login">
+          <ConfingPageItem>
+            <LoginConfigCard />
+          </ConfingPageItem>
+        </Tab>
         <Tab title="修改密码" key="token">
           <ConfingPageItem>
             <ChangePasswordCard />
           </ConfingPageItem>
         </Tab>
+
+        <Tab title="主题配置" key="theme">
+          <ConfingPageItem size="lg">
+            <ThemeConfigCard />
+          </ConfingPageItem>
+        </Tab>
       </Tabs>
     </section>
   )

napcat.webui/src/pages/dashboard/config/login.tsx

@@ -0,0 +1,89 @@
+import { Input } from '@heroui/input'
+import { useRequest } from 'ahooks'
+import { useEffect } from 'react'
+import { Controller, useForm } from 'react-hook-form'
+import toast from 'react-hot-toast'
+
+import SaveButtons from '@/components/button/save_buttons'
+import PageLoading from '@/components/page_loading'
+
+import QQManager from '@/controllers/qq_manager'
+
+const LoginConfigCard = () => {
+  const {
+    data: quickLoginData,
+    loading: quickLoginLoading,
+    error: quickLoginError,
+    refreshAsync: refreshQuickLogin
+  } = useRequest(QQManager.getQuickLoginQQ)
+  const {
+    control,
+    handleSubmit: handleOnebotSubmit,
+    formState: { isSubmitting },
+    setValue: setOnebotValue
+  } = useForm<{
+    quickLoginQQ: string
+  }>({
+    defaultValues: {
+      quickLoginQQ: ''
+    }
+  })
+
+  const reset = () => {
+    setOnebotValue('quickLoginQQ', quickLoginData ?? '')
+  }
+
+  const onSubmit = handleOnebotSubmit(async (data) => {
+    try {
+      await QQManager.setQuickLoginQQ(data.quickLoginQQ)
+      toast.success('保存成功')
+    } catch (error) {
+      const msg = (error as Error).message
+      toast.error(`保存失败: ${msg}`)
+    }
+  })
+
+  const onRefresh = async () => {
+    try {
+      await refreshQuickLogin()
+      toast.success('刷新成功')
+    } catch (error) {
+      const msg = (error as Error).message
+      toast.error(`刷新失败: ${msg}`)
+    }
+  }
+
+  useEffect(() => {
+    reset()
+  }, [quickLoginData])
+
+  if (quickLoginLoading) return <PageLoading loading={true} />
+
+  return (
+    <>
+      <title>OneBot配置 - NapCat WebUI</title>
+      <div className="flex-shrink-0 w-full">快速登录QQ</div>
+      <Controller
+        control={control}
+        name="quickLoginQQ"
+        render={({ field }) => (
+          <Input
+            {...field}
+            label="快速登录QQ"
+            placeholder="请输入QQ号"
+            isDisabled={!!quickLoginError}
+            errorMessage={quickLoginError ? '获取快速登录QQ失败' : undefined}
+          />
+        )}
+      />
+      <SaveButtons
+        onSubmit={onSubmit}
+        reset={reset}
+        isSubmitting={isSubmitting || quickLoginLoading}
+        refresh={onRefresh}
+      />
+    </>
+  )
+}
+
+export default LoginConfigCard

napcat.webui/src/pages/dashboard/config/onebot.tsx

@@ -30,9 +30,9 @@ const OneBotConfigCard = () => {
     setOnebotValue('parseMultMsg', config.parseMultMsg)
   }
 
-  const onSubmit = handleOnebotSubmit((data) => {
+  const onSubmit = handleOnebotSubmit(async (data) => {
     try {
-      saveConfigWithoutNetwork(data)
+      await saveConfigWithoutNetwork(data)
       toast.success('保存成功')
     } catch (error) {
       const msg = (error as Error).message

napcat.webui/src/pages/dashboard/config/theme.tsx

@@ -0,0 +1,279 @@
+import { Accordion, AccordionItem } from '@heroui/accordion'
+import { Card, CardBody, CardHeader } from '@heroui/card'
+import { useRequest } from 'ahooks'
+import clsx from 'clsx'
+import { useEffect, useRef } from 'react'
+import { Controller, useForm, useWatch } from 'react-hook-form'
+import toast from 'react-hot-toast'
+import { FaUserAstronaut } from 'react-icons/fa'
+import { FaPaintbrush } from 'react-icons/fa6'
+import { IoIosColorPalette } from 'react-icons/io'
+import { MdDarkMode, MdLightMode } from 'react-icons/md'
+
+import themes from '@/const/themes'
+
+import ColorPicker from '@/components/ColorPicker'
+import SaveButtons from '@/components/button/save_buttons'
+import PageLoading from '@/components/page_loading'
+
+import { colorKeys, generateTheme, loadTheme } from '@/utils/theme'
+
+import WebUIManager from '@/controllers/webui_manager'
+
+export type PreviewThemeCardProps = {
+  theme: ThemeInfo
+  onPreview: () => void
+}
+
+const values = [
+  '',
+  '-50',
+  '-100',
+  '-200',
+  '-300',
+  '-400',
+  '-500',
+  '-600',
+  '-700',
+  '-800',
+  '-900'
+]
+const colors = [
+  'primary',
+  'secondary',
+  'success',
+  'danger',
+  'warning',
+  'default'
+]
+
+function PreviewThemeCard({ theme, onPreview }: PreviewThemeCardProps) {
+  const style = document.createElement('style')
+  style.innerHTML = generateTheme(theme.theme, theme.name)
+  const cardRef = useRef<HTMLDivElement>(null)
+  useEffect(() => {
+    document.head.appendChild(style)
+    return () => {
+      document.head.removeChild(style)
+    }
+  }, [])
+  return (
+    <Card
+      ref={cardRef}
+      shadow="sm"
+      radius="sm"
+      isPressable
+      onPress={onPreview}
+      className={clsx('text-primary bg-primary-50', theme.name)}
+    >
+      <CardHeader className="pb-0 flex flex-col items-start gap-1">
+        <div className="px-1 rounded-md bg-primary text-primary-foreground">
+          {theme.name}
+        </div>
+        <div className="text-xs flex items-center gap-1 text-primary-300">
+          <FaUserAstronaut />
+          {theme.author ?? '未知'}
+        </div>
+        <div className="text-xs text-primary-200">{theme.description}</div>
+      </CardHeader>
+      <CardBody>
+        <div className="flex flex-col gap-1">
+          {colors.map((color) => (
+            <div className="flex gap-1 items-center flex-wrap" key={color}>
+              <div className="text-xs w-4 text-right">
+                {color[0].toUpperCase()}
+              </div>
+              {values.map((value) => (
+                <div
+                  key={value}
+                  className={clsx(
+                    'w-2 h-2 rounded-full shadow-small',
+                    `bg-${color}${value}`
+                  )}
+                ></div>
+              ))}
+            </div>
+          ))}
+        </div>
+      </CardBody>
+    </Card>
+  )
+}
+
+const ThemeConfigCard = () => {
+  const { data, loading, error, refreshAsync } = useRequest(
+    WebUIManager.getThemeConfig
+  )
+  const {
+    control,
+    handleSubmit: handleOnebotSubmit,
+    formState: { isSubmitting },
+    setValue: setOnebotValue
+  } = useForm<{
+    theme: ThemeConfig
+  }>({
+    defaultValues: {
+      theme: {
+        dark: {},
+        light: {}
+      }
+    }
+  })
+
+  // 使用 useRef 存储 style 标签引用
+  const styleTagRef = useRef<HTMLStyleElement | null>(null)
+
+  // 在组件挂载时创建 style 标签，并在卸载时清理
+  useEffect(() => {
+    const styleTag = document.createElement('style')
+    document.head.appendChild(styleTag)
+    styleTagRef.current = styleTag
+    return () => {
+      if (styleTagRef.current) {
+        document.head.removeChild(styleTagRef.current)
+      }
+    }
+  }, [])
+
+  const theme = useWatch({ control, name: 'theme' })
+
+  const reset = () => {
+    if (data) setOnebotValue('theme', data)
+  }
+
+  const onSubmit = handleOnebotSubmit(async (data) => {
+    try {
+      await WebUIManager.setThemeConfig(data.theme)
+      toast.success('保存成功')
+      loadTheme()
+    } catch (error) {
+      const msg = (error as Error).message
+      toast.error(`保存失败: ${msg}`)
+    }
+  })
+
+  const onRefresh = async () => {
+    try {
+      await refreshAsync()
+      toast.success('刷新成功')
+    } catch (error) {
+      const msg = (error as Error).message
+      toast.error(`刷新失败: ${msg}`)
+    }
+  }
+
+  useEffect(() => {
+    reset()
+  }, [data])
+
+  useEffect(() => {
+    if (theme && styleTagRef.current) {
+      const css = generateTheme(theme)
+      styleTagRef.current.innerHTML = css
+    }
+  }, [theme])
+
+  if (loading) return <PageLoading loading={true} />
+
+  if (error)
+    return (
+      <div className="py-24 text-danger-500 text-center">{error.message}</div>
+    )
+
+  return (
+    <>
+      <title>主题配置 - NapCat WebUI</title>
+
+      <SaveButtons
+        onSubmit={onSubmit}
+        reset={reset}
+        isSubmitting={isSubmitting}
+        refresh={onRefresh}
+        className="items-end w-full p-4"
+      />
+      <div className="px-4 text-sm text-default-600">实时预览，记得保存！</div>
+      <Accordion variant="splitted" defaultExpandedKeys={['select']}>
+        <AccordionItem
+          key="select"
+          aria-label="Pick Color"
+          title="选择主题"
+          subtitle="可以切换夜间/白昼模式查看对应颜色"
+          className="shadow-small"
+          startContent={<IoIosColorPalette />}
+        >
+          <div className="flex flex-wrap gap-2">
+            {themes.map((theme) => (
+              <PreviewThemeCard
+                key={theme.name}
+                theme={theme}
+                onPreview={() => {
+                  setOnebotValue('theme', theme.theme)
+                }}
+              />
+            ))}
+          </div>
+        </AccordionItem>
+
+        <AccordionItem
+          key="pick"
+          aria-label="Pick Color"
+          title="自定义配色"
+          className="shadow-small"
+          startContent={<FaPaintbrush />}
+        >
+          <div className="space-y-2">
+            {(['dark', 'light'] as const).map((mode) => (
+              <div
+                key={mode}
+                className={clsx(
+                  'p-2 rounded-md',
+                  mode === 'dark' ? 'text-white' : 'text-black',
+                  mode === 'dark'
+                    ? 'bg-content1-foreground dark:bg-content1'
+                    : 'bg-content1 dark:bg-content1-foreground'
+                )}
+              >
+                <h3 className="text-center p-2 rounded-md bg-content2 mb-2 text-default-800 flex items-center justify-center">
+                  {mode === 'dark' ? (
+                    <MdDarkMode size={24} />
+                  ) : (
+                    <MdLightMode size={24} />
+                  )}
+                  {mode === 'dark' ? '夜间模式主题' : '白昼模式主题'}
+                </h3>
+                {colorKeys.map((key) => (
+                  <div
+                    key={key}
+                    className="grid grid-cols-2 items-center mb-2 gap-2"
+                  >
+                    <label className="text-right">{key}</label>
+                    <Controller
+                      control={control}
+                      name={`theme.${mode}.${key}`}
+                      render={({ field: { value, onChange } }) => {
+                        const hslArray = value?.split(' ') ?? [0, 0, 0]
+                        const color = `hsl(${hslArray[0]}, ${hslArray[1]}, ${hslArray[2]})`
+                        return (
+                          <ColorPicker
+                            color={color}
+                            onChange={(result) => {
+                              onChange(
+                                `${result.hsl.h} ${result.hsl.s * 100}% ${result.hsl.l * 100}%`
+                              )
+                            }}
+                          />
+                        )
+                      }}
+                    />
+                  </div>
+                ))}
+              </div>
+            ))}
+          </div>
+        </AccordionItem>
+      </Accordion>
+    </>
+  )
+}
+
+export default ThemeConfigCard

napcat.webui/src/pages/dashboard/config/webui.tsx

@@ -7,11 +7,13 @@ import toast from 'react-hot-toast'
 import key from '@/const/key'
 
 import SaveButtons from '@/components/button/save_buttons'
+import FileInput from '@/components/input/file_input'
 import ImageInput from '@/components/input/image_input'
 
 import useMusic from '@/hooks/use-music'
 
 import { siteConfig } from '@/config/site'
+import FileManager from '@/controllers/file_manager'
 
 const WebUIConfigCard = () => {
   const {
@@ -59,17 +61,51 @@ const WebUIConfigCard = () => {
   return (
     <>
       <title>WebUI配置 - NapCat WebUI</title>
-      <Controller
-        control={control}
-        name="musicListID"
-        render={({ field }) => (
-          <Input
-            {...field}
-            label="网易云音乐歌单ID（网页内音乐播放器）"
-            placeholder="请输入歌单ID"
+      <div className="flex flex-col gap-2">
+        <div className="flex-shrink-0 w-full">WebUI字体</div>
+        <div className="text-sm text-default-400">
+          此项不需要手动保存，上传成功后需清空网页缓存并刷新
+          <FileInput
+            label="中文字体"
+            onChange={async (file) => {
+              try {
+                await FileManager.uploadWebUIFont(file)
+                toast.success('上传成功')
+                setTimeout(() => {
+                  window.location.reload()
+                }, 1000)
+              } catch (error) {
+                toast.error('上传失败: ' + (error as Error).message)
+              }
+            }}
+            onDelete={async () => {
+              try {
+                await FileManager.deleteWebUIFont()
+                toast.success('删除成功')
+                setTimeout(() => {
+                  window.location.reload()
+                }, 1000)
+              } catch (error) {
+                toast.error('删除失败: ' + (error as Error).message)
+              }
+            }}
           />
-        )}
-      />
+        </div>
+      </div>
+      <div className="flex flex-col gap-2">
+        <div className="flex-shrink-0 w-full">WebUI音乐播放器</div>
+        <Controller
+          control={control}
+          name="musicListID"
+          render={({ field }) => (
+            <Input
+              {...field}
+              label="网易云音乐歌单ID（网页内音乐播放器）"
+              placeholder="请输入歌单ID"
+            />
+          )}
+        />
+      </div>
       <div className="flex flex-col gap-2">
         <div className="flex-shrink-0 w-full">背景图</div>
         <Controller

napcat.webui/src/pages/dashboard/debug/http/index.tsx

@@ -41,7 +41,7 @@ export default function HttpDebug() {
         >
           <Button
             isIconOnly
-            color="danger"
+            color="primary"
             radius="md"
             variant="shadow"
             size="sm"

napcat.webui/src/pages/dashboard/debug/websocket/index.tsx

@@ -15,7 +15,7 @@ import { useWebSocketDebug } from '@/hooks/use-websocket-debug'
 
 export default function WSDebug() {
   const url = new URL(window.location.origin)
-  url.port = '3000'
+  url.port = '3001'
   url.protocol = 'ws:'
   const defaultWsUrl = url.href
   const [socketConfig, setSocketConfig] = useLocalStorage(key.wsDebugConfig, {
@@ -64,7 +64,7 @@ export default function WSDebug() {
               />
               <div className="flex-shrink-0 flex gap-2 col-span-2 md:col-span-1">
                 <Button
-                  color="danger"
+                  color="primary"
                   onPress={handleConnect}
                   size="lg"
                   radius="full"

napcat.webui/src/pages/dashboard/file_manager.tsx

@@ -332,7 +332,7 @@ export default function FileManagerPage() {
     <div className="p-4">
       <div className="mb-4 flex items-center gap-4 sticky top-14 z-10 bg-content1 py-1">
         <Button
-          color="danger"
+          color="primary"
           size="sm"
           isIconOnly
           variant="flat"
@@ -343,7 +343,7 @@ export default function FileManagerPage() {
         </Button>
 
         <Button
-          color="danger"
+          color="primary"
           size="sm"
           isIconOnly
           variant="flat"
@@ -354,7 +354,7 @@ export default function FileManagerPage() {
         </Button>
 
         <Button
-          color="danger"
+          color="primary"
           isLoading={loading}
           size="sm"
           isIconOnly
@@ -365,7 +365,7 @@ export default function FileManagerPage() {
           <MdRefresh />
         </Button>
         <Button
-          color="danger"
+          color="primary"
           size="sm"
           isIconOnly
           variant="flat"
@@ -379,7 +379,7 @@ export default function FileManagerPage() {
           selectedFiles === 'all') && (
           <>
             <Button
-              color="danger"
+              color="primary"
               size="sm"
               variant="flat"
               onPress={handleBatchDelete}
@@ -391,7 +391,7 @@ export default function FileManagerPage() {
               )
             </Button>
             <Button
-              color="danger"
+              color="primary"
               size="sm"
               variant="flat"
               onPress={() => {
@@ -406,7 +406,7 @@ export default function FileManagerPage() {
               )
             </Button>
             <Button
-              color="danger"
+              color="primary"
               size="sm"
               variant="flat"
               onPress={handleBatchDownload}

napcat.webui/src/pages/dashboard/index.tsx

@@ -105,7 +105,7 @@ const DashboardIndexPage: React.FC = () => {
           <SystemStatusCard setArchInfo={setArchInfo} />
         </div>
         <Networks />
-        <Card className="bg-opacity-60 shadow-sm shadow-danger-50">
+        <Card className="bg-opacity-60 shadow-sm shadow-primary-100">
           <CardBody>
             <Hitokoto />
           </CardBody>

napcat.webui/src/pages/dashboard/terminal.tsx

@@ -133,7 +133,7 @@ export default function TerminalPage() {
                       size="sm"
                       className="min-w-0 w-4 h-4 flex-shrink-0"
                       onPress={() => closeTerminal(tab.id)}
-                      color={selectedTab === tab.id ? 'danger' : 'default'}
+                      color={selectedTab === tab.id ? 'primary' : 'default'}
                     >
                       <IoClose />
                     </Button>
@@ -143,7 +143,7 @@ export default function TerminalPage() {
             </TabList>
             <Button
               isIconOnly
-              color="danger"
+              color="primary"
               size="sm"
               variant="flat"
               onPress={createNewTerminal}

napcat.webui/src/pages/index.tsx

@@ -1,14 +1,46 @@
 import { Spinner } from '@heroui/spinner'
 import { AnimatePresence, motion } from 'motion/react'
-import { Suspense } from 'react'
-import { Outlet, useLocation } from 'react-router-dom'
+import { Suspense, useEffect } from 'react'
+import { Outlet, useLocation, useNavigate } from 'react-router-dom'
 
+import useAuth from '@/hooks/auth'
+import useDialog from '@/hooks/use-dialog'
+
+import WebUIManager from '@/controllers/webui_manager'
 import DefaultLayout from '@/layouts/default'
 
+const CheckDefaultPassword = () => {
+  const { isAuth } = useAuth()
+  const dialog = useDialog()
+  const navigate = useNavigate()
+  const checkDefaultPassword = async () => {
+    const data = await WebUIManager.checkUsingDefaultToken()
+    if (data) {
+      dialog.confirm({
+        title: '修改默认密码',
+        content: '检测到当前密码为默认密码，请尽快修改密码。',
+        confirmText: '前往修改',
+        onConfirm: () => {
+          navigate('/config?tab=token')
+        }
+      })
+    }
+  }
+
+  useEffect(() => {
+    if (isAuth) {
+      checkDefaultPassword()
+    }
+  }, [isAuth])
+  return null
+}
+
 export default function IndexPage() {
   const location = useLocation()
+
   return (
     <DefaultLayout>
+      <CheckDefaultPassword />
       <Suspense
         fallback={
           <div className="flex justify-center px-10">

napcat.webui/src/styles/text.css

@@ -1,6 +1,6 @@
 @layer base {
   .shiny-text {
-    @apply text-pink-400 text-opacity-60;
+    @apply text-primary-400 text-opacity-60;
     background-size: 200% 100%;
     -webkit-background-clip: text;
     background-clip: text;
@@ -10,7 +10,7 @@
     background-image: linear-gradient(
       120deg,
       rgba(255, 50, 50, 0) 40%,
-      rgba(255, 76, 76, 0.8) 50%,
+      hsl(var(--heroui-primary-400) / 0.8) 50%,
       rgba(255, 50, 50, 0) 60%
     );
   }
@@ -18,11 +18,10 @@
     background-image: linear-gradient(
       120deg,
       rgba(255, 255, 255, 0) 40%,
-      rgba(206, 21, 21, 0.8) 50%,
+      hsl(var(--heroui-primary-600) / 0.8) 50%,
       rgba(255, 255, 255, 0) 60%
     );
   }
-
   @keyframes shine {
     0% {
       background-position: 100%;

napcat.webui/src/types/server.d.ts

@@ -48,3 +48,136 @@ interface SystemStatus {
   }
   arch: string
 }
+
+interface ThemeConfigItem {
+  '--heroui-background': string
+  '--heroui-foreground-50': string
+  '--heroui-foreground-100': string
+  '--heroui-foreground-200': string
+  '--heroui-foreground-300': string
+  '--heroui-foreground-400': string
+  '--heroui-foreground-500': string
+  '--heroui-foreground-600': string
+  '--heroui-foreground-700': string
+  '--heroui-foreground-800': string
+  '--heroui-foreground-900': string
+  '--heroui-foreground': string
+  '--heroui-focus': string
+  '--heroui-overlay': string
+  '--heroui-divider': string
+  '--heroui-divider-opacity': string
+  '--heroui-content1': string
+  '--heroui-content1-foreground': string
+  '--heroui-content2': string
+  '--heroui-content2-foreground': string
+  '--heroui-content3': string
+  '--heroui-content3-foreground': string
+  '--heroui-content4': string
+  '--heroui-content4-foreground': string
+  '--heroui-default-50': string
+  '--heroui-default-100': string
+  '--heroui-default-200': string
+  '--heroui-default-300': string
+  '--heroui-default-400': string
+  '--heroui-default-500': string
+  '--heroui-default-600': string
+  '--heroui-default-700': string
+  '--heroui-default-800': string
+  '--heroui-default-900': string
+  '--heroui-default-foreground': string
+  '--heroui-default': string
+  // 新增 danger
+  '--heroui-danger-50': string
+  '--heroui-danger-100': string
+  '--heroui-danger-200': string
+  '--heroui-danger-300': string
+  '--heroui-danger-400': string
+  '--heroui-danger-500': string
+  '--heroui-danger-600': string
+  '--heroui-danger-700': string
+  '--heroui-danger-800': string
+  '--heroui-danger-900': string
+  '--heroui-danger-foreground': string
+  '--heroui-danger': string
+  // 新增 primary
+  '--heroui-primary-50': string
+  '--heroui-primary-100': string
+  '--heroui-primary-200': string
+  '--heroui-primary-300': string
+  '--heroui-primary-400': string
+  '--heroui-primary-500': string
+  '--heroui-primary-600': string
+  '--heroui-primary-700': string
+  '--heroui-primary-800': string
+  '--heroui-primary-900': string
+  '--heroui-primary-foreground': string
+  '--heroui-primary': string
+  // 新增 secondary
+  '--heroui-secondary-50': string
+  '--heroui-secondary-100': string
+  '--heroui-secondary-200': string
+  '--heroui-secondary-300': string
+  '--heroui-secondary-400': string
+  '--heroui-secondary-500': string
+  '--heroui-secondary-600': string
+  '--heroui-secondary-700': string
+  '--heroui-secondary-800': string
+  '--heroui-secondary-900': string
+  '--heroui-secondary-foreground': string
+  '--heroui-secondary': string
+  // 新增 success
+  '--heroui-success-50': string
+  '--heroui-success-100': string
+  '--heroui-success-200': string
+  '--heroui-success-300': string
+  '--heroui-success-400': string
+  '--heroui-success-500': string
+  '--heroui-success-600': string
+  '--heroui-success-700': string
+  '--heroui-success-800': string
+  '--heroui-success-900': string
+  '--heroui-success-foreground': string
+  '--heroui-success': string
+  // 新增 warning
+  '--heroui-warning-50': string
+  '--heroui-warning-100': string
+  '--heroui-warning-200': string
+  '--heroui-warning-300': string
+  '--heroui-warning-400': string
+  '--heroui-warning-500': string
+  '--heroui-warning-600': string
+  '--heroui-warning-700': string
+  '--heroui-warning-800': string
+  '--heroui-warning-900': string
+  '--heroui-warning-foreground': string
+  '--heroui-warning': string
+  // 其它配置
+  '--heroui-code-background': string
+  '--heroui-strong': string
+  '--heroui-code-mdx': string
+  '--heroui-divider-weight': string
+  '--heroui-disabled-opacity': string
+  '--heroui-font-size-tiny': string
+  '--heroui-font-size-small': string
+  '--heroui-font-size-medium': string
+  '--heroui-font-size-large': string
+  '--heroui-line-height-tiny': string
+  '--heroui-line-height-small': string
+  '--heroui-line-height-medium': string
+  '--heroui-line-height-large': string
+  '--heroui-radius-small': string
+  '--heroui-radius-medium': string
+  '--heroui-radius-large': string
+  '--heroui-border-width-small': string
+  '--heroui-border-width-medium': string
+  '--heroui-border-width-large': string
+  '--heroui-box-shadow-small': string
+  '--heroui-box-shadow-medium': string
+  '--heroui-box-shadow-large': string
+  '--heroui-hover-opacity': string
+}
+
+interface ThemeConfig {
+  dark: ThemeConfigItem
+  light: ThemeConfigItem
+}

napcat.webui/src/types/theme.d.ts

@@ -0,0 +1,6 @@
+interface ThemeInfo {
+  theme: ThemeConfig
+  name: string
+  description?: string
+  author?: string
+}

napcat.webui/src/utils/music.ts

@@ -1,19 +1,21 @@
 import { PlayMode } from '@/const/enum'
 
+import WebUIManager from '@/controllers/webui_manager'
 import type {
   FinalMusic,
   Music163ListResponse,
   Music163URLResponse
 } from '@/types/music'
 
-import WebUIManager from '@/controllers/webui_manager'
 /**
  * 获取网易云音乐歌单
  * @param id 歌单id
  * @returns 歌单信息
  */
 export const get163MusicList = async (id: string) => {
-  let res = await WebUIManager.proxy<Music163ListResponse>('https://wavesgame.top/playlist/track/all?id=' + id);
+  let res = await WebUIManager.proxy<Music163ListResponse>(
+    'https://wavesgame.top/playlist/track/all?id=' + id
+  )
   // const res = await request.get<Music163ListResponse>(
   //   `https://wavesgame.top/playlist/track/all?id=${id}`
   // )
@@ -71,7 +73,7 @@ export const get163MusicListSongs = async (id: string) => {
     if (songURL) {
       finalMusic.push({
         id: song.id,
-        url: songURL,
+        url: songURL.replace(/http:\/\//, '//').replace(/https:\/\//, '//'),
         title: song.name,
         artist: song.ar.map((p) => p.name).join('/'),
         cover: song.al.picUrl

napcat.webui/src/utils/theme.ts

@@ -0,0 +1,141 @@
+import { request } from './request'
+
+const style = document.createElement('style')
+document.head.appendChild(style)
+
+export function loadTheme() {
+  request('/files/theme.css?_t=' + Date.now())
+    .then((res) => res.data)
+    .then((css) => {
+      style.innerHTML = css
+    })
+    .catch(() => {
+      console.error('Failed to load theme.css')
+    })
+}
+
+export const colorKeys = [
+  '--heroui-background',
+
+  '--heroui-foreground-50',
+  '--heroui-foreground-100',
+  '--heroui-foreground-200',
+  '--heroui-foreground-300',
+  '--heroui-foreground-400',
+  '--heroui-foreground-500',
+  '--heroui-foreground-600',
+  '--heroui-foreground-700',
+  '--heroui-foreground-800',
+  '--heroui-foreground-900',
+  '--heroui-foreground',
+
+  '--heroui-content1',
+  '--heroui-content1-foreground',
+  '--heroui-content2',
+  '--heroui-content2-foreground',
+  '--heroui-content3',
+  '--heroui-content3-foreground',
+  '--heroui-content4',
+  '--heroui-content4-foreground',
+
+  '--heroui-default-50',
+  '--heroui-default-100',
+  '--heroui-default-200',
+  '--heroui-default-300',
+  '--heroui-default-400',
+  '--heroui-default-500',
+  '--heroui-default-600',
+  '--heroui-default-700',
+  '--heroui-default-800',
+  '--heroui-default-900',
+  '--heroui-default-foreground',
+  '--heroui-default',
+
+  '--heroui-danger-50',
+  '--heroui-danger-100',
+  '--heroui-danger-200',
+  '--heroui-danger-300',
+  '--heroui-danger-400',
+  '--heroui-danger-500',
+  '--heroui-danger-600',
+  '--heroui-danger-700',
+  '--heroui-danger-800',
+  '--heroui-danger-900',
+  '--heroui-danger-foreground',
+  '--heroui-danger',
+
+  '--heroui-primary-50',
+  '--heroui-primary-100',
+  '--heroui-primary-200',
+  '--heroui-primary-300',
+  '--heroui-primary-400',
+  '--heroui-primary-500',
+  '--heroui-primary-600',
+  '--heroui-primary-700',
+  '--heroui-primary-800',
+  '--heroui-primary-900',
+  '--heroui-primary-foreground',
+  '--heroui-primary',
+
+  '--heroui-secondary-50',
+  '--heroui-secondary-100',
+  '--heroui-secondary-200',
+  '--heroui-secondary-300',
+  '--heroui-secondary-400',
+  '--heroui-secondary-500',
+  '--heroui-secondary-600',
+  '--heroui-secondary-700',
+  '--heroui-secondary-800',
+  '--heroui-secondary-900',
+  '--heroui-secondary-foreground',
+  '--heroui-secondary',
+
+  '--heroui-success-50',
+  '--heroui-success-100',
+  '--heroui-success-200',
+  '--heroui-success-300',
+  '--heroui-success-400',
+  '--heroui-success-500',
+  '--heroui-success-600',
+  '--heroui-success-700',
+  '--heroui-success-800',
+  '--heroui-success-900',
+  '--heroui-success-foreground',
+  '--heroui-success',
+
+  '--heroui-warning-50',
+  '--heroui-warning-100',
+  '--heroui-warning-200',
+  '--heroui-warning-300',
+  '--heroui-warning-400',
+  '--heroui-warning-500',
+  '--heroui-warning-600',
+  '--heroui-warning-700',
+  '--heroui-warning-800',
+  '--heroui-warning-900',
+  '--heroui-warning-foreground',
+  '--heroui-warning',
+
+  '--heroui-focus',
+  '--heroui-overlay',
+  '--heroui-divider',
+  '--heroui-code-background',
+  '--heroui-strong',
+  '--heroui-code-mdx'
+] as const
+
+export const generateTheme = (theme: ThemeConfig, validField?: string) => {
+  let css = `:root ${validField ? `.${validField}` : ''}, .light ${validField ? `.${validField}` : ''}, [data-theme="light"] ${validField ? `.${validField}` : ''} {`
+  for (const key in theme.light) {
+    const _key = key as keyof ThemeConfigItem
+    css += `${_key}: ${theme.light[_key]};`
+  }
+  css += `}`
+  css += `.dark ${validField ? `.${validField}` : ''}, [data-theme="dark"] ${validField ? `.${validField}` : ''} {`
+  for (const key in theme.dark) {
+    const _key = key as keyof ThemeConfigItem
+    css += `${_key}: ${theme.dark[_key]};`
+  }
+  css += `}`
+  return css
+}

napcat.webui/tailwind.config.js

@@ -9,9 +9,84 @@ export default {
     './src/components/**/*.{js,ts,jsx,tsx,mdx}',
     './node_modules/@heroui/theme/dist/**/*.{js,ts,jsx,tsx}'
   ],
+  safelist: [
+    {
+      pattern:
+        /bg-(primary|secondary|success|danger|warning|default)-(50|100|200|300|400|500|600|700|800|900)/
+    }
+  ],
   theme: {
     extend: {}
   },
   darkMode: 'class',
-  plugins: [heroui()]
+  plugins: [
+    heroui({
+      themes: {
+        light: {
+          colors: {
+            primary: {
+              DEFAULT: '#f31260',
+              foreground: '#fff',
+              50: '#fee7ef',
+              100: '#fdd0df',
+              200: '#faa0bf',
+              300: '#f871a0',
+              400: '#f54180',
+              500: '#f31260',
+              600: '#c20e4d',
+              700: '#920b3a',
+              800: '#610726',
+              900: '#310413'
+            },
+            danger: {
+              DEFAULT: '#DB3694',
+              foreground: '#fff',
+              50: '#FEEAF6',
+              100: '#FDD7DD',
+              200: '#FBAFC4',
+              300: '#F485AE',
+              400: '#E965A3',
+              500: '#DB3694',
+              600: '#BC278B',
+              700: '#9D1B7F',
+              800: '#7F1170',
+              900: '#690A66'
+            }
+          }
+        },
+        dark: {
+          colors: {
+            primary: {
+              DEFAULT: '#f31260',
+              foreground: '#fff',
+              50: '#310413',
+              100: '#610726',
+              200: '#920b3a',
+              300: '#c20e4d',
+              400: '#f31260',
+              500: '#f54180',
+              600: '#f871a0',
+              700: '#faa0bf',
+              800: '#fdd0df',
+              900: '#fee7ef'
+            },
+            danger: {
+              DEFAULT: '#DB3694',
+              foreground: '#fff',
+              50: '#690A66',
+              100: '#7F1170',
+              200: '#9D1B7F',
+              300: '#BC278B',
+              400: '#DB3694',
+              500: '#E965A3',
+              600: '#F485AE',
+              700: '#FBAFC4',
+              800: '#FDD7DD',
+              900: '#FEEAF6'
+            }
+          }
+        }
+      }
+    })
+  ]
 }

napcat.webui/vite.config.ts

@@ -34,7 +34,8 @@ export default defineConfig(({ mode }) => {
           ws: true,
           changeOrigin: true
         },
-        '/api': backendDebugUrl
+        '/api': backendDebugUrl,
+        '/files': backendDebugUrl
       }
     },
     build: {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.5.2",
+  "version": "4.6.6",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",
@@ -32,7 +32,10 @@
     "@types/express": "^5.0.0",
     "@types/multer": "^1.4.12",
     "@types/node": "^22.0.1",
+    "@types/on-finished": "^2.3.4",
     "@types/qrcode-terminal": "^0.12.2",
+    "@types/react-color": "^3.0.13",
+    "@types/type-is": "^1.6.7",
     "@types/ws": "^8.5.12",
     "@typescript-eslint/eslint-plugin": "^8.3.0",
     "@typescript-eslint/parser": "^8.3.0",
@@ -40,14 +43,14 @@
     "async-mutex": "^0.5.0",
     "commander": "^13.0.0",
     "cors": "^2.8.5",
-    "esbuild": "0.24.0",
+    "esbuild": "0.25.0",
     "eslint": "^9.14.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
     "express-rate-limit": "^7.5.0",
     "fast-xml-parser": "^4.3.6",
     "file-type": "^20.0.0",
-    "globals": "^15.12.0",
+    "globals": "^16.0.0",
     "image-size": "^1.1.1",
     "json5": "^2.2.3",
     "multer": "^1.4.5-lts.1",
@@ -56,13 +59,13 @@
     "vite": "^6.0.1",
     "vite-plugin-cp": "^4.0.8",
     "vite-tsconfig-paths": "^5.1.0",
-    "winston": "^3.17.0"
+    "napcat.protobuf": "^1.1.3",
+    "winston": "^3.17.0",
+    "compressing": "^1.10.1"
   },
   "dependencies": {
     "@ffmpeg.wasm/core-mt": "^0.13.2",
-    "compressing": "^1.10.1",
     "express": "^5.0.0",
-    "piscina": "^4.7.0",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   }

src/common/audio-worker.ts

@@ -1,9 +1,20 @@
 import { encode } from 'silk-wasm';
+import { parentPort } from 'worker_threads';
 
 export interface EncodeArgs {
     input: ArrayBufferView | ArrayBuffer
     sampleRate: number
 }
-export default async ({ input, sampleRate }: EncodeArgs) => {
+export function recvTask<T>(cb: (taskData: T) => Promise<unknown>) {
+    parentPort?.on('message', async (taskData: T) => {
+        try {
+            let ret = await cb(taskData);
+            parentPort?.postMessage(ret);
+        } catch (error: unknown) {
+            parentPort?.postMessage({ error: (error as Error).message });
+        }
+    });
+}
+recvTask<EncodeArgs>(async ({ input, sampleRate }) => {
     return await encode(input, sampleRate);
-};
+});

src/common/audio.ts

@@ -1,4 +1,3 @@
-import Piscina from 'piscina';
 import fsPromise from 'fs/promises';
 import path from 'node:path';
 import { randomUUID } from 'crypto';
@@ -6,16 +5,16 @@ import { EncodeResult, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-w
 import { LogWrapper } from '@/common/log';
 import { EncodeArgs } from '@/common/audio-worker';
 import { FFmpegService } from '@/common/ffmpeg';
+import { runTask } from './worker';
+import { fileURLToPath } from 'node:url';
 
 const ALLOW_SAMPLE_RATE = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
 
-async function getWorkerPath() {
-    return new URL(/* @vite-ignore */ './audio-worker.mjs', import.meta.url).href;
+function getWorkerPath() {
+    //return new URL(/* @vite-ignore */ './audio-worker.mjs', import.meta.url).href;
+    return path.join(path.dirname(fileURLToPath(import.meta.url)), 'audio-worker.mjs');
 }
 
-const piscina = new Piscina<EncodeArgs, EncodeResult>({
-    filename: await getWorkerPath(),
-});
 
 async function guessDuration(pttPath: string, logger: LogWrapper) {
     const pttFileInfo = await fsPromise.stat(pttPath);
@@ -46,7 +45,7 @@ export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: Log
             const { input, sampleRate } = isWav(file)
                 ? await handleWavFile(file, filePath, pcmPath)
                 : { input: await FFmpegService.convert(filePath, pcmPath), sampleRate: 24000 };
-            const silk = await piscina.run({ input: input, sampleRate: sampleRate });
+            const silk = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { input: input, sampleRate: sampleRate });
             fsPromise.unlink(pcmPath).catch((e) => logger.logError('删除临时文件失败', pcmPath, e));
             await fsPromise.writeFile(pttPath, Buffer.from(silk.data));
             logger.log(`语音文件${filePath}转换成功!`, pttPath, '时长:', silk.duration);

src/common/config-base.ts

@@ -66,7 +66,7 @@ export abstract class ConfigBase<T> {
 
     private handleError(e: unknown, message: string): void {
         if (e instanceof SyntaxError) {
-            this.core.context.logger.logError(`[Core] [Config] 操作配置文件格式错误，请检查配置文件:`, e.message);
+            this.core.context.logger.logError('[Core] [Config] 操作配置文件格式错误，请检查配置文件:', e.message);
         } else {
             this.core.context.logger.logError(`[Core] [Config] ${message}:`, (e as Error).message);
         }

src/common/ffmpeg-worker.ts

@@ -5,6 +5,17 @@ import { readFileSync, statSync, writeFileSync } from 'fs';
 import type { VideoInfo } from './video';
 import { fileTypeFromFile } from 'file-type';
 import imageSize from 'image-size';
+import { parentPort } from 'worker_threads';
+export function recvTask<T>(cb: (taskData: T) => Promise<unknown>) {
+    parentPort?.on('message', async (taskData: T) => {
+        try {
+            let ret = await cb(taskData);
+            parentPort?.postMessage(ret);
+        } catch (error: unknown) {
+            parentPort?.postMessage({ error: (error as Error).message });
+        }
+    });
+}
 class FFmpegService {
     public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
         const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
@@ -137,15 +148,18 @@ interface FFmpegTask {
 }
 export default async function handleFFmpegTask({ method, args }: FFmpegTask): Promise<any> {
     switch (method) {
-    case 'extractThumbnail':
-        return await FFmpegService.extractThumbnail(...args as [string, string]);
-    case 'convertFile':
-        return await FFmpegService.convertFile(...args as [string, string, string]);
-    case 'convert':
-        return await FFmpegService.convert(...args as [string, string]);
-    case 'getVideoInfo':
-        return await FFmpegService.getVideoInfo(...args as [string, string]);
-    default:
-        throw new Error(`Unknown method: ${method}`);
+        case 'extractThumbnail':
+            return await FFmpegService.extractThumbnail(...args as [string, string]);
+        case 'convertFile':
+            return await FFmpegService.convertFile(...args as [string, string, string]);
+        case 'convert':
+            return await FFmpegService.convert(...args as [string, string]);
+        case 'getVideoInfo':
+            return await FFmpegService.getVideoInfo(...args as [string, string]);
+        default:
+            throw new Error(`Unknown method: ${method}`);
     }
-}
+}
+recvTask<FFmpegTask>(async ({ method, args }: FFmpegTask) => {
+    return await handleFFmpegTask({ method, args });
+});

src/common/ffmpeg.ts

@@ -1,6 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import Piscina from 'piscina';
 import { VideoInfo } from './video';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { runTask } from './worker';
 
 type EncodeArgs = {
     method: 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo';
@@ -9,42 +11,26 @@ type EncodeArgs = {
 
 type EncodeResult = any;
 
-async function getWorkerPath() {
-    return new URL(/* @vite-ignore */ './ffmpeg-worker.mjs', import.meta.url).href;
+function getWorkerPath() {
+    return path.join(path.dirname(fileURLToPath(import.meta.url)), './ffmpeg-worker.mjs');
 }
 
 export class FFmpegService {
     public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        await piscina.run({ method: 'extractThumbnail', args: [videoPath, thumbnailPath] });
-        await piscina.destroy();
+        await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'extractThumbnail', args: [videoPath, thumbnailPath] });
     }
 
     public static async convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        await piscina.run({ method: 'convertFile', args: [inputFile, outputFile, format] });
-        await piscina.destroy();
+        await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convertFile', args: [inputFile, outputFile, format] });
     }
 
     public static async convert(filePath: string, pcmPath: string): Promise<Buffer> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        const result = await piscina.run({ method: 'convert', args: [filePath, pcmPath] });
-        await piscina.destroy();
+        const result = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convert', args: [filePath, pcmPath] });
         return result;
     }
 
     public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        const result = await piscina.run({ method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
-        await piscina.destroy();
+        const result = await await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
         return result;
     }
 }

src/common/forward-msg-builder.ts

@@ -54,7 +54,7 @@ export class ForwardMsgBuilder {
         const id = crypto.randomUUID();
         const isGroupMsg = msg.some(m => m.isGroupMsg);
         if (!source) {
-            source = isGroupMsg ? '群聊的聊天记录' : msg.map(m => m.senderName).filter((v, i, a) => a.indexOf(v) === i).slice(0, 4).join('和') + '的聊天记录';
+            source = msg.length === 0 ? '聊天记录' : (isGroupMsg ? '群聊的聊天记录' : msg.map(m => m.senderName).filter((v, i, a) => a.indexOf(v) === i).slice(0, 4).join('和') + '的聊天记录');
         }
         if (!news) {
             news = msg.length === 0 ? [{

src/common/log.ts

@@ -232,7 +232,7 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
             tokens.push(`群聊 [${msg.peerName}(${msg.peerUin})]`);
         }
         if (msg.senderUin !== '0') {
-            tokens.push(`[${msg.sendMemberName ?? msg.sendRemarkName ?? msg.sendNickName}(${msg.senderUin})]`);
+            tokens.push(`[${msg.sendMemberName || msg.sendRemarkName || msg.sendNickName}(${msg.senderUin})]`);
         }
     } else if (msg.chatType == ChatType.KCHATTYPEDATALINE) {
         tokens.push('移动设备');

src/common/store.ts

@@ -163,7 +163,7 @@ class Store {
         const current = this.get<StoreValueType>(key);
 
         if (current === null) {
-            this.set(key, 1);
+            this.set(key, 1, 60);
             return 1;
         }
 
@@ -180,7 +180,7 @@ class Store {
         }
 
         const newValue = numericValue + 1;
-        this.set(key, newValue);
+        this.set(key, newValue, 60);
         return newValue;
     }
 }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.5.2';
+export const napCatVersion = '4.6.6';

src/common/worker.ts

@@ -0,0 +1,29 @@
+import { Worker } from 'worker_threads';
+
+export async function runTask<T, R>(workerScript: string, taskData: T): Promise<R> {
+    let worker = new Worker(workerScript);
+    try {
+        return await new Promise<R>((resolve, reject) => {
+            worker.on('message', (result: R) => {
+                resolve(result);
+            });
+
+            worker.on('error', (error) => {
+                reject(new Error(`Worker error: ${error.message}`));
+            });
+
+            worker.on('exit', (code) => {
+                if (code !== 0) {
+                    reject(new Error(`Worker stopped with exit code ${code}`));
+                }
+            });
+            worker.postMessage(taskData);
+        });
+    } catch (error: unknown) {
+        throw new Error(`Failed to run task: ${(error as Error).message}`);
+    } finally {
+        // Ensure the worker is terminated after the promise is settled
+        worker.terminate();
+    }
+}
+

src/core/apis/file.ts

@@ -41,9 +41,10 @@ export class NTQQFileApi {
         this.context = context;
         this.core = core;
         this.rkeyManager = new RkeyManager([
-            'https://rkey.napneko.icu/rkeys'
+            'https://ss.xingzhige.com/music_card/rkey', // 国内
+            'https://secret-service.bietiaop.com/rkeys',//国内
         ],
-            this.context.logger
+        this.context.logger
         );
     }
 
@@ -300,18 +301,18 @@ export class NTQQFileApi {
                     element.elementType === ElementType.FILE
                 ) {
                     switch (element.elementType) {
-                        case ElementType.PIC:
+                    case ElementType.PIC:
                             element.picElement!.sourcePath = elementResults?.[elementIndex] ?? '';
-                            break;
-                        case ElementType.VIDEO:
+                        break;
+                    case ElementType.VIDEO:
                             element.videoElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
-                        case ElementType.PTT:
+                        break;
+                    case ElementType.PTT:
                             element.pttElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
-                        case ElementType.FILE:
+                        break;
+                    case ElementType.FILE:
                             element.fileElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
+                        break;
                     }
                     elementIndex++;
                 }
@@ -434,9 +435,9 @@ export class NTQQFileApi {
         };
 
         try {
-            if (this.core.apis.PacketApi.available && this.packetRkey?.[0] && this.packetRkey?.[1]) {
-                const rkey_expired_private = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
-                const rkey_expired_group = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
+            if (this.core.apis.PacketApi.available) {
+                const rkey_expired_private = !this.packetRkey || (this.packetRkey[0] && this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000);
+                const rkey_expired_group = !this.packetRkey || (this.packetRkey[0] && this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000);
                 if (rkey_expired_private || rkey_expired_group) {
                     this.packetRkey = await this.fetchRkeyWithRetry();
                 }

src/core/apis/group.ts

@@ -165,7 +165,13 @@ export class NTQQGroupApi {
 
         return this.groupMemberCache.get(groupCode);
     }
-
+    async refreshGroupMemberCachePartial(groupCode: string, uid: string) {
+        const member = await this.getGroupMemberEx(groupCode, uid, true);
+        if (member) {
+            this.groupMemberCache.get(groupCode)?.set(uid, member);
+        }
+        return member;
+    }
     async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
         const groupCodeStr = groupCode.toString();
         const memberUinOrUidStr = memberUinOrUid.toString();

src/core/apis/msg.ts

@@ -1,5 +1,5 @@
 import { ChatType, GetFileListParam, Peer, RawMessage, SendMessageElement, SendStatusType } from '@/core/types';
-import { GroupFileInfoUpdateItem, InstanceContext, NapCatCore } from '@/core';
+import { GroupFileInfoUpdateItem, InstanceContext, NapCatCore, NodeIKernelMsgService } from '@/core';
 import { GeneralCallResult } from '@/core/services/common';
 
 export class NTQQMsgApi {
@@ -12,6 +12,11 @@ export class NTQQMsgApi {
         this.context = context;
         this.core = core;
     }
+    
+    async clickInlineKeyboardButton(...params: Parameters<NodeIKernelMsgService['clickInlineKeyboardButton']>) {
+        return this.context.session.getMsgService().clickInlineKeyboardButton(...params);
+    }
+
     getMsgByClientSeqAndTime(peer: Peer, replyMsgClientSeq: string, replyMsgTime: string) {
         // https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType 可以用过特殊方式拉取
         return this.context.session.getMsgService().getMsgByClientSeqAndTime(peer, replyMsgClientSeq, replyMsgTime);
@@ -131,6 +136,20 @@ export class NTQQMsgApi {
         });
     }
 
+    async queryFirstMsgBySender(peer: Peer, SendersUid: string[]) {
+        console.log(peer, SendersUid);
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: SendersUid,
+            filterMsgToTime: '0',
+            filterMsgFromTime: '0',
+            isReverseOrder: true,
+            isIncludeCurrent: true,
+            pageLimit: 20000,
+        });
+    }
+
     async setMsgRead(peer: Peer) {
         return this.context.session.getMsgService().setMsgRead(peer);
     }

src/core/external/appid.json

@@ -186,5 +186,37 @@
     "9.9.17-31363": {
         "appid": 537266500,
         "qua": "V1_WIN_NQ_9.9.17_31363_GW_B"
+    },
+    "3.2.16-32690": {
+        "appid": 537271229,
+        "qua": "V1_LNX_NQ_3.2.16_32690_GW_B"
+    },
+    "9.9.18-32690": {
+        "appid": 537271194,
+        "qua": "V1_WIN_NQ_9.9.18_32690_GW_B"
+    },
+    "6.9.66-32690": {
+        "appid": 537271218,
+        "qua": "V1_MAC_NQ_6.9.66_32690_GW_B"
+    },
+    "3.2.16-32721": {
+        "appid": 537271229,
+        "qua": "V1_LNX_NQ_3.2.16_32721_GW_B"
+    },
+    "9.9.18-32793": {
+        "appid": 537271244,
+        "qua": "V1_WIN_NQ_9.9.18_32793_GW_B"
+    },
+    "3.2.16-32793": {
+        "appid": 537271279,
+        "qua": "V1_LNX_NQ_3.2.16_32793_GW_B"
+    },
+    "3.2.16-32869": {
+        "appid": 537271329,
+        "qua": "V1_LNX_NQ_3.2.16_32869_GW_B"
+    },
+    "9.9.18-32869": {
+        "appid": 537271294,
+        "qua": "V1_WIN_NQ_9.9.18_32869_GW_B"
     }
-}
+}

src/core/external/napcat.json

@@ -4,5 +4,6 @@
     "fileLogLevel": "debug",
     "consoleLogLevel": "info",
     "packetBackend": "auto",
-    "packetServer": ""
-}
+    "packetServer": "",
+    "o3HookMode": 1
+  }

src/core/external/offset.json

@@ -175,7 +175,7 @@
         "send": "713A318",
         "recv": "713DB50"
     },
-    "6.9.63.30851-x64": {
+    "6.9.63-30851-x64": {
         "send": "46C8040",
         "recv": "46CA8AC"
     },
@@ -195,7 +195,7 @@
         "send": "713A318",
         "recv": "713DB50"
     },
-    "6.9.63.30899-x64": {
+    "6.9.63-30899-x64": {
         "send": "46C8040",
         "recv": "46CA8AC"
     },
@@ -211,7 +211,7 @@
         "send": "39C1350",
         "recv": "39C5784"
     },
-    "6.9.63.31245-x64": {
+    "6.9.63-31245-x64": {
         "send": "4720A40",
         "recv": "47232AC"
     },
@@ -239,12 +239,56 @@
         "send": "71BFD48",
         "recv": "71C3580"
     },
-    "6.9.65.31363-x64": {
+    "6.9.65-31363-x64": {
         "send": "4720E80",
         "recv": "47236EC"
     },
-    "6.9.65.31363-arm64": {
+    "6.9.65-31363-arm64": {
         "send": "422CEF8",
         "recv": "422F710"
+    },
+    "9.9.18-32690-x64": {
+        "send": "39F9630",
+        "recv": "39FDE30"
+    },
+    "3.2.16-32690-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32690-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
+    },
+    "3.2.16-32721-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32721-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
+    },
+    "9.9.18-32793-x64": {
+        "send": "39F9A30",
+        "recv": "39FE230"
+    },
+    "3.2.16-32793-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32793-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
+    },
+    "9.9.18-32896-x64": {
+        "send": "39F9A30",
+        "recv": "39FE230"
+    },
+    "3.2.16-32896-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32896-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
     }
-}
+}

src/core/helper/config.ts

@@ -9,7 +9,8 @@ export const NapcatConfigSchema = Type.Object({
     fileLogLevel: Type.String({ default: 'debug' }),
     consoleLogLevel: Type.String({ default: 'info' }),
     packetBackend: Type.String({ default: 'auto' }),
-    packetServer: Type.String({ default: '' })
+    packetServer: Type.String({ default: '' }),
+    o3HookMode: Type.Number({ default: 0 }),
 });
 
 export type NapcatConfig = Static<typeof NapcatConfigSchema>;

src/core/listeners/NodeIKernelSearchListener.ts

@@ -1,4 +1,4 @@
-import { ChatType } from '@/core';
+import { ChatType, RawMessage } from '@/core';
 export interface SearchGroupInfo {
     groupCode: string;
     ownerUid: string;
@@ -56,7 +56,7 @@ export interface GroupSearchResult {
     nextPos: number;
 }
 export interface NodeIKernelSearchListener {
-    
+
     onSearchGroupResult(params: GroupSearchResult): any;
 
     onSearchFileKeywordsResult(params: {
@@ -94,4 +94,27 @@ export interface NodeIKernelSearchListener {
             }[]
         }[]
     }): any;
+
+    onSearchMsgKeywordsResult(params: {
+        searchId: string,
+        hasMore: boolean,
+        resultItems: Array<{
+            msgId: string,
+            msgSeq: string,
+            msgTime: string,
+            senderUid: string,
+            senderUin: string,
+            senderNick: string,
+            senderNickHits: unknown[],
+            senderRemark: string,
+            senderRemarkHits: unknown[],
+            senderCard: string,
+            senderCardHits: unknown[],
+            fieldType: number,
+            fieldText: string,
+            msgRecord: RawMessage;
+            hitsInfo: Array<unknown>,
+            msgAbstract: unknown,
+        }>
+    }): void | Promise<void>;
 }