fix: #769

fix: #721

manifest.json

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

napcat.webui/package.json

@@ -32,6 +32,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",

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

@@ -27,7 +27,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

@@ -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

@@ -74,6 +74,9 @@ export default function ImageNameButton({
             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/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.ERROR]: 'primary',
-  [LogLevel.FATAL]: 'danger'
+  [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/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

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',
+              'bg-opacity-30 bg-primary-50 backdrop-blur-sm border border-primary-300 mb-2',
-            input: 'bg-transparent !text-danger-400 !placeholder-danger-400'
+            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', {
+                className={clsx('text-sm text-primary-200', {
-                  '!text-danger-400': apiName === selectedApi
+                  '!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,7 +55,7 @@ const renderItems = (items: MenuItem[], children = false) => {
             isActive && 'bg-opacity-60',
             b64img && 'backdrop-blur-md text-white'
           )}
-          color="danger"
+          color="primary"
           endContent={
             canOpen ? (
               // div实现箭头V效果
@@ -63,7 +63,9 @@ const renderItems = (items: MenuItem[], children = false) => {
                 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-red-300 dark:text-white',
                   'before:rounded-full',
                   'before:content-[""]',
                   'before:block',
@@ -95,7 +97,7 @@ 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-primary-500 animate-spinner-ease-spin'
                     : 'bg-red-300 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-50 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">
+    <Card className="bg-opacity-60 shadow-sm shadow-primary-50 dark:shadow-primary-100 overflow-visible flex-1">
-      <CardHeader className="pb-0 items-center gap-1 text-danger-500 font-extrabold">
+      <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

@@ -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-50 dark: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/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)
+    if (listId && token) fetchMusicList(listId)
-  }, [listId])
+  }, [listId, token])
   return (
     <AudioContext.Provider
       value={{

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/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 (
+        return <Skeleton className="h-16 rounded-lg" />
-          <div className="flex-1 h-32 flex items-center justify-center bg-default-100 rounded-lg">
-            <Spinner />
-          </div>
-        )
       }
 
       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/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

@@ -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-50">
           <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/tailwind.config.js

@@ -13,5 +13,74 @@ export default {
     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'
+            }
+          }
+        }
+      }
+    })
+  ]
 }

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.5.5",
+  "version": "4.5.9",
   "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",

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/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.5.5';
+export const napCatVersion = '4.5.9';

src/core/apis/file.ts

@@ -43,7 +43,7 @@ export class NTQQFileApi {
         this.rkeyManager = new RkeyManager([
             'https://rkey.napneko.icu/rkeys'
         ],
-            this.context.logger
+        this.context.logger
         );
     }
 
@@ -300,18 +300,18 @@ export class NTQQFileApi {
                     element.elementType === ElementType.FILE
                 ) {
                     switch (element.elementType) {
-                        case ElementType.PIC:
+                    case ElementType.PIC:
                             element.picElement!.sourcePath = elementResults?.[elementIndex] ?? '';
-                            break;
+                        break;
-                        case ElementType.VIDEO:
+                    case ElementType.VIDEO:
                             element.videoElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
+                        break;
-                        case ElementType.PTT:
+                    case ElementType.PTT:
                             element.pttElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
+                        break;
-                        case ElementType.FILE:
+                    case ElementType.FILE:
                             element.fileElement!.filePath = elementResults?.[elementIndex] ?? '';
-                            break;
+                        break;
                     }
                     elementIndex++;
                 }

src/core/packet/context/operationContext.ts

@@ -1,20 +1,22 @@
 import * as crypto from 'crypto';
-import { PacketContext } from '@/core/packet/context/packetContext';
+import {PacketContext} from '@/core/packet/context/packetContext';
 import * as trans from '@/core/packet/transformer';
-import { PacketMsg } from '@/core/packet/message/message';
+import {PacketMsg} from '@/core/packet/message/message';
 import {
     PacketMsgFileElement,
     PacketMsgPicElement,
     PacketMsgPttElement,
     PacketMsgVideoElement
 } from '@/core/packet/message/element';
-import { ChatType } from '@/core';
+import {ChatType, MsgSourceType, NTMsgType, RawMessage} from '@/core';
-import { MiniAppRawData, MiniAppReqParams } from '@/core/packet/entities/miniApp';
+import {MiniAppRawData, MiniAppReqParams} from '@/core/packet/entities/miniApp';
-import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
+import {AIVoiceChatType} from '@/core/packet/entities/aiChat';
-import { NapProtoDecodeStructType, NapProtoEncodeStructType } from '@napneko/nap-proto-core';
+import {NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg} from '@napneko/nap-proto-core';
-import { IndexNode, MsgInfo } from '@/core/packet/transformer/proto';
+import {IndexNode, LongMsgResult, MsgInfo} from '@/core/packet/transformer/proto';
-import { OidbPacket } from '@/core/packet/transformer/base';
+import {OidbPacket} from '@/core/packet/transformer/base';
-import { ImageOcrResult } from '@/core/packet/entities/ocrResult';
+import {ImageOcrResult} from '@/core/packet/entities/ocrResult';
+import {gunzipSync} from 'zlib';
+import {PacketMsgConverter} from '@/core/packet/message/converter';
 
 export class PacketOperationContext {
     private readonly context: PacketContext;
@@ -57,10 +59,10 @@ export class PacketOperationContext {
             const res = trans.GetStrangerInfo.parse(resp);
             const extBigInt = BigInt(res.data.status.value);
             if (extBigInt <= 10n) {
-                return { status: Number(extBigInt) * 10, ext_status: 0 };
+                return {status: Number(extBigInt) * 10, ext_status: 0};
             }
             status = Number((extBigInt & 0xff00n) + ((extBigInt >> 16n) & 0xffn));
-            return { status: 10, ext_status: status };
+            return {status: 10, ext_status: status};
         } catch {
             return undefined;
         }
@@ -77,13 +79,13 @@ export class PacketOperationContext {
         const reqList = msg.flatMap(m =>
             m.msg.map(e => {
                 if (e instanceof PacketMsgPicElement) {
-                    return this.context.highway.uploadImage({ chatType, peerUid }, e);
+                    return this.context.highway.uploadImage({chatType, peerUid}, e);
                 } else if (e instanceof PacketMsgVideoElement) {
-                    return this.context.highway.uploadVideo({ chatType, peerUid }, e);
+                    return this.context.highway.uploadVideo({chatType, peerUid}, e);
                 } else if (e instanceof PacketMsgPttElement) {
-                    return this.context.highway.uploadPtt({ chatType, peerUid }, e);
+                    return this.context.highway.uploadPtt({chatType, peerUid}, e);
                 } else if (e instanceof PacketMsgFileElement) {
-                    return this.context.highway.uploadFile({ chatType, peerUid }, e);
+                    return this.context.highway.uploadFile({chatType, peerUid}, e);
                 }
                 return null;
             }).filter(Boolean)
@@ -116,6 +118,13 @@ export class PacketOperationContext {
         return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
     }
 
+    async GetGroupImageUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
+        const req = trans.DownloadGroupImage.build(groupUin, node);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadImage.parse(resp);
+        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
+    }
+
     async ImageOCR(imgUrl: string) {
         const req = trans.ImageOCR.build(imgUrl);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -195,4 +204,74 @@ export class PacketOperationContext {
             return res.msgInfo;
         }
     }
+
+    async FetchForwardMsg(res_id: string): Promise<RawMessage[]> {
+        const req = trans.DownloadForwardMsg.build(this.context.napcore.basicInfo.uid, res_id);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadForwardMsg.parse(resp);
+        const inflate = gunzipSync(res.result.payload);
+        const result = new NapProtoMsg(LongMsgResult).decode(inflate);
+
+        const main = result.action.find((r) => r.actionCommand === 'MultiMsg');
+        if (!main?.actionData.msgBody) {
+            throw new Error('msgBody is empty');
+        }
+
+        const messagesPromises = main.actionData.msgBody.map(async (msg) => {
+            if (!msg?.body?.richText?.elems) {
+                throw new Error('msg.body.richText.elems is empty');
+            }
+            const rawChains = new PacketMsgConverter().packetMsgToRaw(msg?.body?.richText?.elems);
+            const elements = await Promise.all(
+                rawChains.map(async ([element, rawElem]) => {
+                    if (element.picElement && rawElem?.commonElem?.pbElem) {
+                        const extra = new NapProtoMsg(MsgInfo).decode(rawElem.commonElem.pbElem);
+                        const index = extra?.msgInfoBody[0]?.index;
+                        if (msg?.responseHead.grp !== undefined) {
+                            const groupUin = msg?.responseHead.grp?.groupUin ?? 0;
+                            element.picElement = {
+                                ...element.picElement,
+                                originImageUrl: await this.GetGroupImageUrl(groupUin, index!)
+                            };
+                        } else {
+                            element.picElement = {
+                                ...element.picElement,
+                                originImageUrl: await this.GetImageUrl(this.context.napcore.basicInfo.uid, index!)
+                            };
+                        }
+                        return element;
+                    }
+                    return element;
+                })
+            );
+            return {
+                chatType: ChatType.KCHATTYPEGROUP,
+                elements: elements,
+                guildId: '',
+                isOnlineMsg: false,
+                msgId: '7467703692092974645',  // TODO: no necessary
+                msgRandom: '0',
+                msgSeq: String(msg.contentHead.sequence ?? 0),
+                msgTime: String(msg.contentHead.timeStamp ?? 0),
+                msgType: NTMsgType.KMSGTYPEMIX,
+                parentMsgIdList: [],
+                parentMsgPeer: {
+                    chatType: ChatType.KCHATTYPEGROUP,
+                    peerUid: String(msg?.responseHead.grp?.groupUin ?? 0),
+                },
+                peerName: '',
+                peerUid: '1094950020',
+                peerUin: '1094950020',
+                recallTime: '0',
+                records: [],
+                sendNickName: msg?.responseHead.grp?.memberName ?? '',
+                sendRemarkName: msg?.responseHead.grp?.memberName ?? '',
+                senderUid: '',
+                senderUin: '1094950020',
+                sourceType: MsgSourceType.K_DOWN_SOURCETYPE_UNKNOWN,
+                subMsgType: 1,
+            };
+        });
+        return await Promise.all(messagesPromises);
+    }
 }

src/core/packet/message/converter.ts

@@ -1,8 +1,8 @@
 import {
-    Peer,
     ChatType,
     ElementType,
     MessageElement,
+    Peer,
     RawMessage,
     SendArkElement,
     SendFaceElement,
@@ -31,7 +31,9 @@ import {
     PacketMsgVideoElement,
     PacketMultiMsgElement
 } from '@/core/packet/message/element';
-import { PacketMsg, PacketSendMsgElement } from '@/core/packet/message/message';
+import {PacketMsg, PacketSendMsgElement} from '@/core/packet/message/message';
+import {NapProtoDecodeStructType} from '@napneko/nap-proto-core';
+import {Elem} from '@/core/packet/transformer/proto';
 
 const SupportedElementTypes = [
     ElementType.TEXT,
@@ -154,4 +156,16 @@ export class PacketMsgConverter {
             }).filter((e) => e !== null)
         };
     }
+
+    packetMsgToRaw(msg: NapProtoDecodeStructType<typeof Elem>[]): [MessageElement, NapProtoDecodeStructType<typeof Elem> | null][] {
+        const converters = [PacketMsgTextElement.parseElement,
+            PacketMsgAtElement.parseElement, PacketMsgReplyElement.parseElement, PacketMsgPicElement.parseElement];
+        return msg.map((element) => {
+            for (const converter of converters) {
+                const result = converter(element);
+                if (result) return result;
+            }
+            return null;
+        }).filter((e) => e !== null);
+    }
 }

src/core/packet/message/element.ts

@@ -1,20 +1,22 @@
 import * as zlib from 'node:zlib';
-import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
+import {NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg} from '@napneko/nap-proto-core';
 import {
     CustomFace,
     Elem,
+    FileExtra,
+    GroupFileExtra,
     MarkdownData,
     MentionExtra,
+    MsgInfo,
     NotOnlineImage,
+    OidbSvcTrpcTcp0XE37_800Response,
     QBigFaceExtra,
     QSmallFaceExtra,
-    MsgInfo,
-    OidbSvcTrpcTcp0XE37_800Response,
-    FileExtra,
-    GroupFileExtra
 } from '@/core/packet/transformer/proto';
 import {
+    ElementType,
     FaceType,
+    MessageElement,
     NTMsgAtType,
     PicType,
     SendArkElement,
@@ -29,8 +31,11 @@ import {
     SendTextElement,
     SendVideoElement
 } from '@/core';
-import { ForwardMsgBuilder } from '@/common/forward-msg-builder';
+import {ForwardMsgBuilder} from '@/common/forward-msg-builder';
-import { PacketMsg, PacketSendMsgElement } from '@/core/packet/message/message';
+import {PacketMsg, PacketSendMsgElement} from '@/core/packet/message/message';
+
+export type ParseElementFnR = [MessageElement, NapProtoDecodeStructType<typeof Elem> | null] | undefined;
+type ParseElementFn = (elem: NapProtoDecodeStructType<typeof Elem>) => ParseElementFnR;
 
 // raw <-> packet
 // TODO: SendStructLongMsgElement
@@ -51,6 +56,8 @@ export abstract class IPacketMsgElement<T extends PacketSendMsgElement> {
         return [];
     }
 
+    static parseElement: ParseElementFn;
+
     toPreview(): string {
         return '[暂不支持该消息类型喵~]';
     }
@@ -72,11 +79,30 @@ export class PacketMsgTextElement extends IPacketMsgElement<SendTextElement> {
         }];
     }
 
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem.text?.str && (elem.text?.attr6Buf === undefined || elem.text?.attr6Buf?.length === 0)) {
+            return [{
+                textElement: {
+                    content: elem.text?.str,
+                    atType: NTMsgAtType.ATTYPEUNKNOWN,
+                    atUid: '',
+                    atTinyId: '',
+                    atNtUid: '',
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, null];
+        }
+        return undefined;
+    };
+
     override toPreview(): string {
         return this.text;
-    }
+    };
 }
 
+
+
 export class PacketMsgAtElement extends PacketMsgTextElement {
     targetUid: string;
     atAll: boolean;
@@ -101,6 +127,22 @@ export class PacketMsgAtElement extends PacketMsgTextElement {
             }
         }];
     }
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem.text?.str && (elem.text?.attr6Buf?.length ?? 100) >= 11) {
+            return [{
+                textElement: {
+                    content: elem.text?.str,
+                    atType: NTMsgAtType.ATTYPEONE,
+                    atUid: String(Buffer.from(elem.text!.attr6Buf!).readUInt32BE(7)),  // FIXME: hack
+                    atTinyId: '',
+                    atNtUid: '',
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, null];
+        }
+        return undefined;
+    };
 }
 
 export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
@@ -137,21 +179,28 @@ export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
                 pbReserve: {
                     messageId: this.messageId,
                 },
-                toUin: BigInt(0),
+                toUin: BigInt(this.targetUin),
+                type: 1,
             }
-        }, {
-            text: this.isGroupReply ? {
-                str: 'nya~',
-                pbReserve: new NapProtoMsg(MentionExtra).encode({
-                    type: this.targetUin === 0 ? 1 : 2,
-                    uin: 0,
-                    field5: 0,
-                    uid: String(this.targetUid),
-                }),
-            } : undefined,
         }];
     }
 
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem.srcMsg && elem.srcMsg.pbReserve) {
+            const reserve = elem.srcMsg.pbReserve;
+            return [{
+                replyElement: {
+                    replayMsgSeq: String(reserve.friendSeq ?? elem.srcMsg?.origSeqs?.[0] ?? 0),
+                    replayMsgId: String(reserve.messageId ?? 0),
+                    senderUin: String(elem?.srcMsg ?? 0)
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, null];
+        }
+        return undefined;
+    };
+
     override toPreview(): string {
         return '[回复消息]';
     }
@@ -207,6 +256,46 @@ export class PacketMsgFaceElement extends IPacketMsgElement<SendFaceElement> {
         }
     }
 
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem.face?.index) {
+            return [{
+                faceElement: {
+                    faceIndex: elem.face.index,
+                    faceType: FaceType.Normal
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, null];
+        }
+        if (elem?.commonElem?.serviceType === 37 && elem?.commonElem?.pbElem) {
+            const qface = new NapProtoMsg(QBigFaceExtra).decode(elem?.commonElem?.pbElem);
+            if (qface?.faceId) {
+                return [{
+                    faceElement: {
+                        faceIndex: qface.faceId,
+                        faceType: FaceType.Normal
+                    },
+                    elementType: ElementType.UNKNOWN,
+                    elementId: '',
+                }, null];
+            }
+        }
+        if (elem?.commonElem?.serviceType === 33 && elem?.commonElem?.pbElem) {
+            const qface = new NapProtoMsg(QSmallFaceExtra).decode(elem?.commonElem?.pbElem);
+            if (qface?.faceId) {
+                return [{
+                    faceElement: {
+                        faceIndex: qface.faceId,
+                        faceType: FaceType.Normal
+                    },
+                    elementType: ElementType.UNKNOWN,
+                    elementId: '',
+                }, null];
+            }
+        }
+        return undefined;
+    };
+
     override toPreview(): string {
         return '[表情]';
     }
@@ -295,6 +384,60 @@ export class PacketMsgPicElement extends IPacketMsgElement<SendPicElement> {
         }];
     }
 
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem?.commonElem?.serviceType === 48 || [10, 20].includes(elem?.commonElem?.businessType ?? 0)) {
+            const extra = new NapProtoMsg(MsgInfo).decode(elem.commonElem!.pbElem!);
+            const msgInfoBody = extra.msgInfoBody[0];
+            const index = msgInfoBody?.index;
+            return [{
+                picElement: {
+                    fileSize: index?.info.fileSize ?? 0,
+                    picWidth: index?.info?.width ?? 0,
+                    picHeight: index?.info?.height ?? 0,
+                    fileName: index?.info?.fileHash ?? '',
+                    sourcePath: '',
+                    original: false,
+                    picType: PicType.NEWPIC_APNG,
+                    fileUuid: '',
+                    fileSubId: '',
+                    thumbFileSize: 0,
+                    summary: '[图片]',
+                    thumbPath: new Map(),
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, elem];
+        }
+        if (elem?.notOnlineImage) {
+            const img = elem?.notOnlineImage; // url in originImageUrl
+            const preImg: MessageElement = {
+                picElement: {
+                    fileSize: img.fileLen ?? 0,
+                    picWidth: img.picWidth ?? 0,
+                    picHeight: img.picHeight ?? 0,
+                    fileName: Buffer.from(img.picMd5!).toString('hex') ?? '',
+                    sourcePath: '',
+                    original: false,
+                    picType: PicType.NEWPIC_APNG,
+                    fileUuid: '',
+                    fileSubId: '',
+                    thumbFileSize: 0,
+                    summary: '[图片]',
+                    thumbPath: new Map(),
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            };
+            if (img.origUrl?.includes('&fileid=')) {
+                preImg.picElement!.originImageUrl = `https://multimedia.nt.qq.com.cn${img.origUrl}`;
+            } else {
+                preImg.picElement!.originImageUrl = `https://gchat.qpic.cn${img.origUrl}`;
+            }
+            return [preImg, elem];
+        }
+        return undefined;
+    };
+
     override toPreview(): string {
         return this.summary;
     }

src/core/packet/transformer/highway/DownloadGroupImage.ts

@@ -0,0 +1,50 @@
+import * as proto from '@/core/packet/transformer/proto';
+import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
+import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
+import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
+import { IndexNode } from '@/core/packet/transformer/proto';
+
+class DownloadGroupImage extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
+    constructor() {
+        super();
+    }
+
+    build(group_uin: number, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
+        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
+            reqHead: {
+                common: {
+                    requestId: 1,
+                    command: 200
+                },
+                scene: {
+                    requestType: 2,
+                    businessType: 1,
+                    sceneType: 2,
+                    group: {
+                        groupUin: group_uin
+                    }
+                },
+                client: {
+                    agentType: 2,
+                }
+            },
+            download: {
+                node: node,
+                download: {
+                    video: {
+                        busiType: 0,
+                        sceneType: 0
+                    }
+                }
+            }
+        });
+        return OidbBase.build(0x11C4, 200, body, true, false);
+    }
+
+    parse(data: Buffer) {
+        const oidbBody = OidbBase.parse(data).body;
+        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
+    }
+}
+
+export default new DownloadGroupImage();

src/core/packet/transformer/highway/DownloadImage.ts

@@ -14,7 +14,7 @@ class DownloadImage extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
             reqHead: {
                 common: {
                     requestId: 1,
-                    command: 100
+                    command: 200
                 },
                 scene: {
                     requestType: 2,

src/core/packet/transformer/highway/index.ts

@@ -12,3 +12,4 @@ export { default as UploadPrivateImage } from './UploadPrivateImage';
 export { default as UploadPrivatePtt } from './UploadPrivatePtt';
 export { default as UploadPrivateVideo } from './UploadPrivateVideo';
 export { default as DownloadImage } from './DownloadImage';
+export { default as DownloadGroupImage } from './DownloadGroupImage';

src/core/packet/transformer/message/DownloadForwardMsg.ts

@@ -0,0 +1,37 @@
+import * as proto from '@/core/packet/transformer/proto';
+import { NapProtoMsg } from '@napneko/nap-proto-core';
+import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
+
+class DownloadForwardMsg extends PacketTransformer<typeof proto.RecvLongMsgResp> {
+    constructor() {
+        super();
+    }
+
+    build(uid: string, resId: string): OidbPacket {
+        const req = new NapProtoMsg(proto.RecvLongMsgReq).encode({
+            info: {
+                uid: {
+                    uid: uid
+                },
+                resId: resId,
+                acquire: true
+            },
+            settings: {
+                field1: 2,
+                field2: 0,
+                field3: 0,
+                field4: 0
+            }
+        });
+        return {
+            cmd: 'trpc.group.long_msg_interface.MsgService.SsoRecvLongMsg',
+            data: PacketHexStrBuilder(req)
+        };
+    }
+
+    parse(data: Buffer) {
+        return new NapProtoMsg(proto.RecvLongMsgResp).decode(data);
+    }
+}
+
+export default new DownloadForwardMsg();

src/core/packet/transformer/message/index.ts

@@ -1 +1,2 @@
 export { default as UploadForwardMsg } from './UploadForwardMsg';
+export { default as DownloadForwardMsg } from './DownloadForwardMsg';

src/core/packet/transformer/proto/message/action.ts

@@ -2,7 +2,7 @@ import { ProtoField, ScalarType } from '@napneko/nap-proto-core';
 import { PushMsgBody } from '@/core/packet/transformer/proto';
 
 export const LongMsgResult = {
-    action: ProtoField(2, () => LongMsgAction)
+    action: ProtoField(2, () => LongMsgAction, false, true)
 };
 
 export const LongMsgAction = {

src/framework/napcat.cjs

@@ -15,7 +15,6 @@ let napCatInitialized = false; // 添加一个标志
 function createServiceProxy(ServiceName) {
     return new Proxy(() => { }, {
         get: (target, FunctionName) => {
-            console.log(ServiceName, FunctionName);
             if (ServiceName === 'NodeIQQNTWrapperSession' && FunctionName === 'create') {
                 return () => new Proxy({}, {
                     get: function (target, ClassFunName, receiver) {

src/onebot/action/go-cqhttp/GetForwardMsg.ts

@@ -3,6 +3,7 @@ import { OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageForward,
 import { ActionName } from '@/onebot/action/router';
 import { MessageUnique } from '@/common/message-unique';
 import { Static, Type } from '@sinclair/typebox';
+import { ChatType, ElementType, MsgSourceType, NTMsgType, RawMessage } from '@/core';
 
 const SchemaData = Type.Object({
     message_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
@@ -57,24 +58,72 @@ export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
             throw new Error('message_id is required');
         }
 
+        const fakeForwardMsg = (res_id: string) => {
+            return {
+                chatType: ChatType.KCHATTYPEGROUP,
+                elements: [{
+                    elementType: ElementType.MULTIFORWARD,
+                    elementId: '',
+                    multiForwardMsgElement: {
+                        resId: res_id,
+                        fileName: '',
+                        xmlContent: '',
+                    }
+                }],
+                guildId: '',
+                isOnlineMsg: false,
+                msgId: '',  // TODO: no necessary
+                msgRandom: '0',
+                msgSeq: '',
+                msgTime: '',
+                msgType: NTMsgType.KMSGTYPEMIX,
+                parentMsgIdList: [],
+                parentMsgPeer: {
+                    chatType: ChatType.KCHATTYPEGROUP,
+                    peerUid: '',
+                },
+                peerName: '',
+                peerUid: '284840486',
+                peerUin: '284840486',
+                recallTime: '0',
+                records: [],
+                sendNickName: '',
+                sendRemarkName: '',
+                senderUid: '',
+                senderUin: '1094950020',
+                sourceType: MsgSourceType.K_DOWN_SOURCETYPE_UNKNOWN,
+                subMsgType: 1,
+            } as RawMessage;
+        };
+
+        const protocolFallbackLogic = async (res_id: string) => {
+            const ob = (await this.obContext.apis.MsgApi.parseMessageV2(fakeForwardMsg(res_id)))?.arrayMsg;
+            if (ob) {
+                return {
+                    messages: (ob?.message?.[0] as OB11MessageForward)?.data?.content
+                };
+            }
+            throw new Error('protocolFallbackLogic: 找不到相关的聊天记录');
+        };
+
         const rootMsgId = MessageUnique.getShortIdByMsgId(msgId.toString());
         const rootMsg = MessageUnique.getMsgIdAndPeerByShortId(rootMsgId ?? +msgId);
         if (!rootMsg) {
-            throw new Error('msg not found');
+            return await protocolFallbackLogic(msgId.toString());
         }
         const data = await this.core.apis.MsgApi.getMsgsByMsgId(rootMsg.Peer, [rootMsg.MsgId]);
 
         if (!data || data.result !== 0) {
-            throw new Error('找不到相关的聊天记录' + data?.errMsg);
+            return await protocolFallbackLogic(msgId.toString());
         }
 
         const singleMsg = data.msgList[0];
         if (!singleMsg) {
-            throw new Error('找不到相关的聊天记录');
+            return await protocolFallbackLogic(msgId.toString());
         }
         const resMsg = (await this.obContext.apis.MsgApi.parseMessageV2(singleMsg))?.arrayMsg;//强制array 以便处理
         if (!(resMsg?.message?.[0] as OB11MessageForward)?.data?.content) {
-            throw new Error('找不到相关的聊天记录');
+            return await protocolFallbackLogic(msgId.toString());
         }
         return {
             messages: (resMsg?.message?.[0] as OB11MessageForward)?.data?.content

src/onebot/api/msg.ts

@@ -1,41 +1,50 @@
-import { FileNapCatOneBotUUID } from '@/common/file-uuid';
+import {FileNapCatOneBotUUID} from '@/common/file-uuid';
-import { MessageUnique } from '@/common/message-unique';
+import {MessageUnique} from '@/common/message-unique';
 import {
-    NTMsgAtType,
     ChatType,
     CustomMusicSignPostData,
     ElementType,
     FaceIndex,
+    FaceType,
+    GrayTipElement,
+    GroupNotify,
     IdMusicSignPostData,
     MessageElement,
     NapCatCore,
     NTGrayTipElementSubTypeV2,
+    NTMsgAtType,
     Peer,
     RawMessage,
     SendMessageElement,
     SendTextElement,
-    FaceType,
-    GrayTipElement,
-    GroupNotify,
 } from '@/core';
 import faceConfig from '@/core/external/face_config.json';
-import { NapCatOneBot11Adapter, OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageFileBase, OB11MessageForward, OB11MessageImage, OB11MessageVideo, } from '@/onebot';
+import {
-import { OB11Construct } from '@/onebot/helper/data';
+    NapCatOneBot11Adapter,
-import { EventType } from '@/onebot/event/OneBotEvent';
+    OB11Message,
-import { encodeCQCode } from '@/onebot/helper/cqcode';
+    OB11MessageData,
-import { uriToLocalFile } from '@/common/file';
+    OB11MessageDataType,
-import { RequestUtil } from '@/common/request';
+    OB11MessageFileBase,
-import fsPromise, { constants } from 'node:fs/promises';
+    OB11MessageForward,
-import { OB11FriendAddNoticeEvent } from '@/onebot/event/notice/OB11FriendAddNoticeEvent';
+    OB11MessageImage,
-import { ForwardMsgBuilder } from '@/common/forward-msg-builder';
+    OB11MessageVideo,
-import { NapProtoMsg } from '@napneko/nap-proto-core';
+} from '@/onebot';
-import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent';
+import {OB11Construct} from '@/onebot/helper/data';
-import { OB11GroupDecreaseEvent, GroupDecreaseSubType } from '../event/notice/OB11GroupDecreaseEvent';
+import {EventType} from '@/onebot/event/OneBotEvent';
-import { GroupAdmin } from '@/core/packet/transformer/proto/message/groupAdmin';
+import {encodeCQCode} from '@/onebot/helper/cqcode';
-import { OB11GroupAdminNoticeEvent } from '../event/notice/OB11GroupAdminNoticeEvent';
+import {uriToLocalFile} from '@/common/file';
-import { GroupChange, GroupChangeInfo, GroupInvite, PushMsgBody } from '@/core/packet/transformer/proto';
+import {RequestUtil} from '@/common/request';
-import { OB11GroupRequestEvent } from '../event/request/OB11GroupRequest';
+import fsPromise, {constants} from 'node:fs/promises';
-import { LRUCache } from '@/common/lru-cache';
+import {OB11FriendAddNoticeEvent} from '@/onebot/event/notice/OB11FriendAddNoticeEvent';
+import {ForwardMsgBuilder} from '@/common/forward-msg-builder';
+import {NapProtoMsg} from '@napneko/nap-proto-core';
+import {OB11GroupIncreaseEvent} from '../event/notice/OB11GroupIncreaseEvent';
+import {GroupDecreaseSubType, OB11GroupDecreaseEvent} from '../event/notice/OB11GroupDecreaseEvent';
+import {GroupAdmin} from '@/core/packet/transformer/proto/message/groupAdmin';
+import {OB11GroupAdminNoticeEvent} from '../event/notice/OB11GroupAdminNoticeEvent';
+import {GroupChange, GroupChangeInfo, GroupInvite, PushMsgBody} from '@/core/packet/transformer/proto';
+import {OB11GroupRequestEvent} from '../event/request/OB11GroupRequest';
+import {LRUCache} from '@/common/lru-cache';
 
 type RawToOb11Converters = {
     [Key in keyof MessageElement as Key extends `${string}Element` ? Key : never]: (
@@ -84,12 +93,12 @@ export class OneBotMsgApi {
                 }
                 return {
                     type: OB11MessageDataType.text,
-                    data: { text },
+                    data: {text},
                 };
             } else {
                 let qq: string = 'all';
                 if (element.atType !== NTMsgAtType.ATTYPEALL) {
-                    const { atNtUid, atUid } = element;
+                    const {atNtUid, atUid} = element;
                     qq = !atUid || atUid === '0' ? await this.core.apis.UserApi.getUinByUidV2(atNtUid) : atUid;
                 }
                 return {
@@ -197,7 +206,7 @@ export class OneBotMsgApi {
                 peerUid: msg.peerUid,
                 guildId: '',
             };
-            const { emojiId } = _;
+            const {emojiId} = _;
             const dir = emojiId.substring(0, 2);
             const url = `https://gxh.vip.qq.com/club/item/parcel/item/${dir}/${emojiId}/raw300.gif`;
             const filename = `${dir}-${emojiId}.gif`;
@@ -264,7 +273,6 @@ export class OneBotMsgApi {
             }
 
 
-
             // 丢弃该消息段
             if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
                 this.core.context.logger.logError(
@@ -355,18 +363,25 @@ export class OneBotMsgApi {
             };
         },
 
-        multiForwardMsgElement: async (_, msg, _wrapper, context) => {
+        multiForwardMsgElement: async (element, msg, _wrapper, context) => {
             const parentMsgPeer = msg.parentMsgPeer ?? {
                 chatType: msg.chatType,
                 guildId: '',
                 peerUid: msg.peerUid,
             };
-            const multiMsgs = await this.getMultiMessages(msg, parentMsgPeer);
+            let multiMsgs = await this.getMultiMessages(msg, parentMsgPeer);
             // 拉取失败则跳过
-            if (!multiMsgs) return null;
+            if (!multiMsgs || multiMsgs.length === 0) {
+                try {
+                    multiMsgs = await this.core.apis.PacketApi.pkt.operation.FetchForwardMsg(element.resId);
+                } catch (e) {
+                    this.core.context.logger.logError('Protocol FetchForwardMsg fallback failed!', e);
+                    return null;
+                }
+            }
             const forward: OB11MessageForward = {
                 type: OB11MessageDataType.forward,
-                data: { id: msg.msgId }
+                data: {id: msg.msgId}
             };
             if (!context.parseMultMsg) return forward;
             forward.data.content = await this.parseMultiMessageContent(
@@ -397,7 +412,7 @@ export class OneBotMsgApi {
     };
 
     ob11ToRawConverters: Ob11ToRawConverters = {
-        [OB11MessageDataType.text]: async ({ data: { text } }) => ({
+        [OB11MessageDataType.text]: async ({data: {text}}) => ({
             elementType: ElementType.TEXT,
             elementId: '',
             textElement: {
@@ -409,7 +424,7 @@ export class OneBotMsgApi {
             },
         }),
 
-        [OB11MessageDataType.at]: async ({ data: { qq: atQQ } }, context) => {
+        [OB11MessageDataType.at]: async ({data: {qq: atQQ}}, context) => {
             function at(atUid: string, atNtUid: string, atType: NTMsgAtType, atName: string): SendTextElement {
                 return {
                     elementType: ElementType.TEXT,
@@ -436,7 +451,7 @@ export class OneBotMsgApi {
             return at(atQQ, uid, NTMsgAtType.ATTYPEONE, info.nick || '');
         },
 
-        [OB11MessageDataType.reply]: async ({ data: { id } }) => {
+        [OB11MessageDataType.reply]: async ({data: {id}}) => {
             const replyMsgM = MessageUnique.getMsgIdAndPeerByShortId(parseInt(id));
             if (!replyMsgM) {
                 this.core.context.logger.logWarn('回复消息不存在', id);
@@ -458,7 +473,7 @@ export class OneBotMsgApi {
                 undefined;
         },
 
-        [OB11MessageDataType.face]: async ({ data: { id, resultId, chainCount } }) => {
+        [OB11MessageDataType.face]: async ({data: {id, resultId, chainCount}}) => {
             const parsedFaceId = +id;
             // 从face_config.json中获取表情名称
             const sysFaces = faceConfig.sysface;
@@ -522,12 +537,12 @@ export class OneBotMsgApi {
         },
 
         [OB11MessageDataType.file]: async (sendMsg, context) => {
-            const { path, fileName } = await this.handleOb11FileLikeMessage(sendMsg, context);
+            const {path, fileName} = await this.handleOb11FileLikeMessage(sendMsg, context);
             return await this.core.apis.FileApi.createValidSendFileElement(context, path, fileName);
         },
 
         [OB11MessageDataType.video]: async (sendMsg, context) => {
-            const { path, fileName } = await this.handleOb11FileLikeMessage(sendMsg, context);
+            const {path, fileName} = await this.handleOb11FileLikeMessage(sendMsg, context);
 
             let thumb = sendMsg.data.thumb;
             if (thumb) {
@@ -545,7 +560,7 @@ export class OneBotMsgApi {
             this.core.apis.FileApi.createValidSendPttElement(
                 (await this.handleOb11FileLikeMessage(sendMsg, context)).path),
 
-        [OB11MessageDataType.json]: async ({ data: { data } }) => ({
+        [OB11MessageDataType.json]: async ({data: {data}}) => ({
             elementType: ElementType.ARK,
             elementId: '',
             arkElement: {
@@ -588,13 +603,13 @@ export class OneBotMsgApi {
         }),
 
         // Need signing
-        [OB11MessageDataType.markdown]: async ({ data: { content } }) => ({
+        [OB11MessageDataType.markdown]: async ({data: {content}}) => ({
             elementType: ElementType.MARKDOWN,
             elementId: '',
-            markdownElement: { content },
+            markdownElement: {content},
         }),
 
-        [OB11MessageDataType.music]: async ({ data }, context) => {
+        [OB11MessageDataType.music]: async ({data}, context) => {
             // 保留, 直到...找到更好的解决方案
             if (data.id !== undefined) {
                 if (!['qq', '163', 'kugou', 'kuwo', 'migu'].includes(data.type)) {
@@ -618,8 +633,8 @@ export class OneBotMsgApi {
 
             let postData: IdMusicSignPostData | CustomMusicSignPostData;
             if (data.id === undefined && data.content) {
-                const { content, ...others } = data;
+                const {content, ...others} = data;
-                postData = { singer: content, ...others };
+                postData = {singer: content, ...others};
             } else {
                 postData = data;
             }
@@ -631,7 +646,7 @@ export class OneBotMsgApi {
             try {
                 const musicJson = await RequestUtil.HttpGetJson<string>(signUrl, 'POST', postData);
                 return this.ob11ToRawConverters.json({
-                    data: { data: musicJson },
+                    data: {data: musicJson},
                     type: OB11MessageDataType.json
                 }, context);
             } catch (e) {
@@ -642,10 +657,10 @@ export class OneBotMsgApi {
 
         [OB11MessageDataType.node]: async () => undefined,
 
-        [OB11MessageDataType.forward]: async ({ data }, context) => {
+        [OB11MessageDataType.forward]: async ({data}, context) => {
             const jsonData = ForwardMsgBuilder.fromResId(data.id);
             return this.ob11ToRawConverters.json({
-                data: { data: JSON.stringify(jsonData) },
+                data: {data: JSON.stringify(jsonData)},
                 type: OB11MessageDataType.json
             }, context);
         },
@@ -665,17 +680,17 @@ export class OneBotMsgApi {
 
         [OB11MessageDataType.miniapp]: async () => undefined,
 
-        [OB11MessageDataType.contact]: async ({ data: { type = 'qq', id } }, context) => {
+        [OB11MessageDataType.contact]: async ({data: {type = 'qq', id}}, context) => {
             if (type === 'qq') {
                 const arkJson = await this.core.apis.UserApi.getBuddyRecommendContactArkJson(id.toString(), '');
                 return this.ob11ToRawConverters.json({
-                    data: { data: arkJson.arkMsg },
+                    data: {data: arkJson.arkMsg},
                     type: OB11MessageDataType.json
                 }, context);
             } else if (type === 'group') {
                 const arkJson = await this.core.apis.GroupApi.getGroupRecommendContactArkJson(id.toString());
                 return this.ob11ToRawConverters.json({
-                    data: { data: arkJson.arkJson },
+                    data: {data: arkJson.arkJson},
                     type: OB11MessageDataType.json
                 }, context);
             }
@@ -692,7 +707,10 @@ export class OneBotMsgApi {
         if (grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
             if (grayTipElement.jsonGrayTipElement.busiId == 1061) {
                 const PokeEvent = await this.obContext.apis.FriendApi.parsePrivatePokeEvent(grayTipElement, Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
-                if (PokeEvent) { return PokeEvent; };
+                if (PokeEvent) {
+                    return PokeEvent;
+                }
+                ;
             } else if (grayTipElement.jsonGrayTipElement.busiId == 19324 && msg.peerUid !== '') {
                 return new OB11FriendAddNoticeEvent(this.core, Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
             }
@@ -849,7 +867,7 @@ export class OneBotMsgApi {
                             element[key],
                             msg,
                             element,
-                            { parseMultMsg }
+                            {parseMultMsg}
                         );
                         if (key === 'faceElement' && !parsedElement) {
                             return null;
@@ -902,13 +920,13 @@ export class OneBotMsgApi {
             ) => Promise<SendMessageElement | undefined>;
             const callResult = converter(
                 sendMsg,
-                { peer, deleteAfterSentFiles },
+                {peer, deleteAfterSentFiles},
             )?.catch(undefined);
             callResultList.push(callResult);
         }
         const ret = await Promise.all(callResultList);
         const sendElements: SendMessageElement[] = ret.filter(ele => !!ele);
-        return { sendElements, deleteAfterSentFiles };
+        return {sendElements, deleteAfterSentFiles};
     }
 
     async sendMsgWithOb11UniqueId(peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[]) {
@@ -970,8 +988,8 @@ export class OneBotMsgApi {
     }
 
     private async handleOb11FileLikeMessage(
-        { data: inputdata }: OB11MessageFileBase,
+        {data: inputdata}: OB11MessageFileBase,
-        { deleteAfterSentFiles }: SendMessageContext
+        {deleteAfterSentFiles}: SendMessageContext
     ) {
         let realUri = [inputdata.url, inputdata.file, inputdata.path].find(uri => uri && uri.trim()) ?? '';
         if (!realUri) {
@@ -980,28 +998,29 @@ export class OneBotMsgApi {
         }
 
         const downloadFile = async (uri: string) => {
-            const { path, fileName, errMsg, success } = await uriToLocalFile(this.core.NapCatTempPath, uri);
+            const {path, fileName, errMsg, success} = await uriToLocalFile(this.core.NapCatTempPath, uri);
             if (!success) {
                 this.core.context.logger.logError('文件下载失败', errMsg);
                 throw new Error('文件下载失败: ' + errMsg);
             }
-            return { path, fileName };
+            return {path, fileName};
         };
         try {
-            const { path, fileName } = await downloadFile(realUri);
+            const {path, fileName} = await downloadFile(realUri);
             deleteAfterSentFiles.push(path);
-            return { path, fileName: inputdata.name ?? fileName };
+            return {path, fileName: inputdata.name ?? fileName};
         } catch {
             realUri = await this.handleObfuckName(realUri);
-            const { path, fileName } = await downloadFile(realUri);
+            const {path, fileName} = await downloadFile(realUri);
             deleteAfterSentFiles.push(path);
-            return { path, fileName: inputdata.name ?? fileName };
+            return {path, fileName: inputdata.name ?? fileName};
         }
     }
+
     async handleObfuckName(name: string) {
         const contextMsgFile = FileNapCatOneBotUUID.decode(name);
         if (contextMsgFile && contextMsgFile.msgId && contextMsgFile.elementId) {
-            const { peer, msgId, elementId } = contextMsgFile;
+            const {peer, msgId, elementId} = contextMsgFile;
             const rawMessage = (await this.core.apis.MsgApi.getMsgsByMsgId(peer, [msgId]))?.msgList.find(msg => msg.msgId === msgId);
             const mixElement = rawMessage?.elements.find(e => e.elementId === elementId);
             const mixElementInner = mixElement?.videoElement ?? mixElement?.fileElement ?? mixElement?.pttElement ?? mixElement?.picElement;
@@ -1009,18 +1028,19 @@ export class OneBotMsgApi {
             let url = '';
             if (mixElement?.picElement && rawMessage) {
                 const tempData =
-                    await this.obContext.apis.MsgApi.rawToOb11Converters.picElement?.(mixElement?.picElement, rawMessage, mixElement, { parseMultMsg: false }) as OB11MessageImage | undefined;
+                    await this.obContext.apis.MsgApi.rawToOb11Converters.picElement?.(mixElement?.picElement, rawMessage, mixElement, {parseMultMsg: false}) as OB11MessageImage | undefined;
                 url = tempData?.data.url ?? '';
             }
             if (mixElement?.videoElement && rawMessage) {
                 const tempData =
-                    await this.obContext.apis.MsgApi.rawToOb11Converters.videoElement?.(mixElement?.videoElement, rawMessage, mixElement, { parseMultMsg: false }) as OB11MessageVideo | undefined;
+                    await this.obContext.apis.MsgApi.rawToOb11Converters.videoElement?.(mixElement?.videoElement, rawMessage, mixElement, {parseMultMsg: false}) as OB11MessageVideo | undefined;
                 url = tempData?.data.url ?? '';
             }
             return url !== '' ? url : await this.core.apis.FileApi.downloadMedia(msgId, peer.chatType, peer.peerUid, elementId, '', '');
         }
         throw new Error('文件名解析失败');
     }
+
     groupChangDecreseType2String(type: number): GroupDecreaseSubType {
         switch (type) {
         case 130:

src/onebot/config/index.ts

@@ -1,5 +1,5 @@
 import { ConfigBase } from '@/common/config-base';
-import { NapCatCore } from '@/core';
+import type { NapCatCore } from '@/core';
 import { OneBotConfig } from './config';
 import { AnySchema } from 'ajv';
 

src/webui/src/api/OB11Config.ts

@@ -1,13 +1,12 @@
 import { RequestHandler } from 'express';
 import { existsSync, readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
-
+import { loadConfig, OneBotConfig } from '@/onebot/config/config';
-import { OneBotConfig } from '@/onebot/config/config';
-
 import { webUiPathWrapper } from '@/webui';
 import { WebUiDataRuntime } from '@webapi/helper/Data';
 import { sendError, sendSuccess } from '@webapi/utils/response';
 import { isEmpty } from '@webapi/utils/check';
+import json5 from 'json5';
 
 // 获取OneBot11配置
 export const OB11GetConfigHandler: RequestHandler = (_, res) => {
@@ -19,16 +18,16 @@ export const OB11GetConfigHandler: RequestHandler = (_, res) => {
     }
     // 获取登录的QQ号
     const uin = WebUiDataRuntime.getQQLoginUin();
-    // 读取配置文件
+    // 读取配置文件路径
     const configFilePath = resolve(webUiPathWrapper.configPath, `./onebot11_${uin}.json`);
     // 尝试解析配置文件
     try {
-        // 读取配置文件
+        // 读取配置文件内容
-        const data = JSON.parse(
+        const configFileContent = existsSync(configFilePath)
-            existsSync(configFilePath)
+            ? readFileSync(configFilePath).toString()
-                ? readFileSync(configFilePath).toString()
+            : readFileSync(resolve(webUiPathWrapper.configPath, './onebot11.json')).toString();
-                : readFileSync(resolve(webUiPathWrapper.configPath, './onebot11.json')).toString()
+        // 解析配置文件并加载配置
-        ) as OneBotConfig;
+        const data = loadConfig(json5.parse(configFileContent)) as OneBotConfig;
         // 返回配置文件
         return sendSuccess(res, data);
     } catch (e) {
@@ -50,9 +49,12 @@ export const OB11SetConfigHandler: RequestHandler = async (req, res) => {
     }
     // 写入配置
     try {
-        await WebUiDataRuntime.setOB11Config(JSON.parse(req.body.config));
+        // 解析并加载配置
+        const config = loadConfig(json5.parse(req.body.config)) as OneBotConfig;
+        // 写入配置
+        await WebUiDataRuntime.setOB11Config(config);
         return sendSuccess(res, null);
     } catch (e) {
         return sendError(res, 'Error: ' + e);
     }
-};
+};