Merge pull request #499 from kanocence/main

修复 config 页面样式

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "3.4.11",
+  "version": "3.6.3",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",

src/common/file.ts

@@ -215,7 +215,7 @@ export async function checkUriType(Uri: string) {
         }
         if (uri.startsWith('file://')) {
             let filePath: string;
-            const pathname = decodeURIComponent(new URL(uri).pathname);
+            const pathname = decodeURIComponent(new URL(uri).pathname + new URL(uri).hash);
             if (process.platform === 'win32') {
                 filePath = pathname.slice(1);
             } else {

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '3.4.11';
+export const napCatVersion = '3.6.3';

src/core/apis/packet.ts

@@ -25,6 +25,7 @@ import { OidbSvcTrpcTcp0X929B_0Resp, OidbSvcTrpcTcp0X929D_0Resp } from "@/core/p
 import { IndexNode, MsgInfo } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq";
 import { NTV2RichMediaResp } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp";
 import { RecvPacketData } from "@/core/packet/client/client";
+import { napCatVersion } from "@/common/version";
 
 
 interface OffsetType {
@@ -61,11 +62,12 @@ export class NTQQPacketApi {
         this.qqVersion = qqversion;
         const table = typedOffset[qqversion + '-' + os.arch()];
         if (!table) {
-            this.logger.logError('[Core] [Packet] PacketServer Offset table not found for QQVersion: ', qqversion + '-' + os.arch());
+            this.logger.logError(`[Core] [Packet] PacketBackend 不支持当前QQ版本架构：${qqversion}-${os.arch()}，
+            请参照 https://github.com/NapNeko/NapCatQQ/releases/tag/v${napCatVersion} 配置正确的QQ版本！`);
             return false;
         }
         if (this.core.configLoader.configData.packetBackend === 'disable') {
-            this.logger.logWarn('[Core] [Packet] 已禁用Packet后端，NapCat.Packet将不会加载！');
+            this.logger.logWarn('[Core] [Packet] 已禁用PacketBackend，NapCat.Packet将不会加载！');
             return false;
         }
         this.packetSession = new PacketSession(this.core);

src/core/apis/webapi.ts

@@ -283,7 +283,7 @@ export class NTQQWebApi {
                 this.context.logger.logError.bind(this.context.logger)('获取群聊之火失败');
             }
         }
-        if (getType === WebHonorType.PERFORMER || getType === WebHonorType.ALL) {
+        if (getType === WebHonorType.LEGEND || getType === WebHonorType.ALL) {
             const RetInternal = await getDataInternal(groupCode, 3);
             if (RetInternal) {
                 HonorInfo.legend_list = [];

src/core/packet/session.ts

@@ -45,7 +45,7 @@ export class PacketSession {
             client = this.judgeClient(core);
             break;
         default:
-            this.logger.logError(`[Core] [Packet] 未知的Packet后端类型 ${prefer}，请检查配置文件！`);
+            this.logger.logError(`[Core] [Packet] 未知的PacketBackend ${prefer}，请检查配置文件！`);
             client = null;
         }
         if (!(client && client.check(core))) {

src/onebot/action/extends/SetGroupSign.ts

@@ -5,7 +5,7 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 const SchemaData = {
     type: 'object',
     properties: {
-        group_id: { type: 'string' },
+        group_id: { type: ['string', 'number'] },
     },
     required: ['group_id'],
 } as const satisfies JSONSchema;
@@ -17,6 +17,9 @@ export class SetGroupSign extends BaseAction<Payload, any> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        return await this.core.apis.PacketApi.sendGroupSignPacket(payload.group_id);
+        return await this.core.apis.PacketApi.sendGroupSignPacket(payload.group_id.toString());
     }
 }
+export class SendGroupSign extends SetGroupSign {
+    actionName = ActionName.SendGroupSign;
+}

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

@@ -6,10 +6,15 @@ const SchemaData = {
     type: 'object',
     properties: {
         friend_id: { type: ['string', 'number'] },
+        user_id: { type: ['string', 'number'] },
         temp_block: { type: 'boolean' },
         temp_both_del: { type: 'boolean' },
     },
-    required: ['friend_id'],
+    oneOf: [
+        { required: ['friend_id'] },
+        { required: ['user_id'] },
+    ],
+
 } as const satisfies JSONSchema;
 type Payload = FromSchema<typeof SchemaData>;
 
@@ -18,7 +23,8 @@ export class GoCQHTTPDeleteFriend extends BaseAction<Payload, any> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        const uid = await this.core.apis.UserApi.getUidByUinV2(payload.friend_id.toString());
+        const uin = payload.friend_id ?? payload.user_id ?? '';
+        const uid = await this.core.apis.UserApi.getUidByUinV2(uin.toString());
 
         if (!uid) {
             return {

src/onebot/action/group/GetAiRecord.ts

@@ -2,8 +2,6 @@ import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus";
 import { AIVoiceChatType } from "@/core/packet/entities/aiChat";
-import { NapProtoEncodeStructType } from "@/core/packet/proto/NapProto";
-import { IndexNode } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq";
 
 const SchemaData = {
     type: 'object',

src/onebot/action/index.ts

@@ -92,7 +92,7 @@ import { GetGroupFileUrl } from "@/onebot/action/file/GetGroupFileUrl";
 import { GetPacketStatus } from "@/onebot/action/packet/GetPacketStatus";
 import { FriendPoke } from "@/onebot/action/user/FriendPoke";
 import { GetCredentials } from './system/GetCredentials';
-import { SetGroupSign } from './extends/SetGroupSign';
+import { SendGroupSign, SetGroupSign } from './extends/SetGroupSign';
 import { GoCQHTTPGetGroupAtAllRemain } from './go-cqhttp/GetGroupAtAllRemain';
 import { GoCQHTTPCheckUrlSafely } from './go-cqhttp/GoCQHTTPCheckUrlSafely';
 import { GoCQHTTPGetModelShow } from './go-cqhttp/GoCQHTTPGetModelShow';
@@ -125,6 +125,7 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new TranslateEnWordToZn(obContext, core),
         new GetGroupRootFiles(obContext, core),
         new SetGroupSign(obContext, core),
+        new SendGroupSign(obContext, core),
         // onebot11
         new SendLike(obContext, core),
         new GetMsg(obContext, core),

src/onebot/action/types.ts

@@ -136,6 +136,8 @@ export enum ActionName {
     GetGroupIgnoredNotifies = 'get_group_ignored_notifies',
 
     SetGroupSign = "set_group_sign",
+    SendGroupSign = "send_group_sign",
+    
     GetMiniAppArk = "get_mini_app_ark",
     // UploadForwardMsg = "upload_forward_msg",
     GetAiRecord = "get_ai_record",

static/assets/renderer.js

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V3.4.11", "napcat-update-button", "secondary")
+          SettingButton("V3.6.3", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([

static/config.html

@@ -10,6 +10,20 @@
     <link rel="stylesheet" href="./assets/webcomponents.css" />
     <link rel="stylesheet" href="./assets/style.css" />
     <link rel="stylesheet" href="./assets/color.css" />
+    <style>
+        body > div {
+            padding: 12px;
+
+            @media screen and (min-width: 900px) {
+                width: 900px;
+                margin: 0 auto;
+            }
+        }
+
+        ob-setting-select {
+            width: 210px;
+        }
+    </style>
     <!-- 脚手架 -->
     <!-- 渲染脚本 -->
     <script>