release: v3.1.10

manifest.json

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

package.json

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

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '3.1.9';
+export const napCatVersion = '3.1.10';

src/core/apis/file.ts

@@ -296,18 +296,18 @@ export class NTQQFileApi {
                     element.elementType === ElementType.FILE
                 ) {
                     switch (element.elementType) {
-                        case ElementType.PIC:
+                    case ElementType.PIC:
                             element.picElement!.sourcePath = elementResults[elementIndex];
-                            break;
-                        case ElementType.VIDEO:
+                        break;
+                    case ElementType.VIDEO:
                             element.videoElement!.filePath = elementResults[elementIndex];
-                            break;
-                        case ElementType.PTT:
+                        break;
+                    case ElementType.PTT:
                             element.pttElement!.filePath = elementResults[elementIndex];
-                            break;
-                        case ElementType.FILE:
+                        break;
+                    case ElementType.FILE:
                             element.fileElement!.filePath = elementResults[elementIndex];
-                            break;
+                        break;
                     }
                     elementIndex++;
                 }

src/core/packet/msg/converter.ts

@@ -31,8 +31,8 @@ import {
     PacketMsgVideoElement,
     PacketMultiMsgElement
 } from "@/core/packet/msg/element";
-import {PacketMsg, PacketSendMsgElement} from "@/core/packet/msg/message";
-import {LogWrapper} from "@/common/log";
+import { PacketMsg, PacketSendMsgElement } from "@/core/packet/msg/message";
+import { LogWrapper } from "@/common/log";
 
 const SupportedElementTypes = [
     ElementType.TEXT,
@@ -118,7 +118,7 @@ export class PacketMsgConverter {
                 if (!this.isValidElementType(element.elementType)) return null;
                 return this.rawToPacketMsgConverters[element.elementType](element);
             }).filter((e) => e !== null)
-        }
+        };
     }
 
     private rawToPacketMsgConverters: ElementToPacketMsgConverters = {

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

@@ -16,11 +16,11 @@ export class GoCQHTTPGetGroupAtAllRemain extends BaseAction<Payload, any> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        let ret = await this.core.apis.GroupApi.getGroupRemainAtTimes(payload.group_id.toString());
+        const ret = await this.core.apis.GroupApi.getGroupRemainAtTimes(payload.group_id.toString());
         if (!ret.atInfo || ret.result !== 0) {
             throw new Error('atInfo not found');
         }
-        let data = {
+        const data = {
             can_at_all: ret.atInfo.canAtAll,
             remain_at_all_count_for_group: ret.atInfo.RemainAtAllCountForGroup,
             remain_at_all_count_for_uin: ret.atInfo.RemainAtAllCountForUin

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

@@ -18,7 +18,7 @@ export class GoCQHTTPDeleteFriend extends BaseAction<Payload, any> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        let uid = await this.core.apis.UserApi.getUidByUinV2(payload.friend_id.toString());
+        const uid = await this.core.apis.UserApi.getUidByUinV2(payload.friend_id.toString());
 
         if (!uid) {
             return {
@@ -26,7 +26,7 @@ export class GoCQHTTPDeleteFriend extends BaseAction<Payload, any> {
                 message: '好友不存在',
             };
         }
-        let isBuddy = await this.core.apis.FriendApi.isBuddy(uid);
+        const isBuddy = await this.core.apis.FriendApi.isBuddy(uid);
         if (!isBuddy) {
             return {
                 valid: false,

src/onebot/action/msg/SendMsg.ts

@@ -172,10 +172,10 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                 const OB11Data = normalize(node.type === OB11MessageDataType.node ? node.data.content : node);
                 let sendElements: SendMessageElement[];
 
-                if (getSpecialMsgNum({message: OB11Data}, OB11MessageDataType.node)) {
+                if (getSpecialMsgNum({ message: OB11Data }, OB11MessageDataType.node)) {
                     const uploadReturnData = await this.uploadForwardedNodesPacket(msgPeer, OB11Data as OB11MessageNode[], node.data.source, node.data.news, node.data.summary, node.data.prompt, {
-                        user_id: node.data.user_id?.toString() ?? parentMeta?.user_id ?? this.core.selfInfo.uin,
-                        nickname: node.data.nickname ?? parentMeta?.nickname ?? "QQ用户",
+                        user_id: (node.data.user_id || node.data.uin)?.toString() ?? parentMeta?.user_id ?? this.core.selfInfo.uin,
+                        nickname: (node.data.nickname || node.data.name) ?? parentMeta?.nickname ?? "QQ用户",
                     }, dp + 1);
                     sendElements = uploadReturnData?.finallySendElements ? [uploadReturnData.finallySendElements] : [];
                 } else {
@@ -184,8 +184,8 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                 }
 
                 const packetMsgElements: rawMsgWithSendMsg = {
-                    senderUin: Number(node.data.user_id ?? parentMeta?.user_id) || +this.core.selfInfo.uin,
-                    senderName: node.data.nickname ?? parentMeta?.nickname ?? "QQ用户",
+                    senderUin: Number((node.data.user_id || node.data.uin) ?? parentMeta?.user_id) || +this.core.selfInfo.uin,
+                    senderName: (node.data.nickname || node.data.name) ?? parentMeta?.nickname ?? "QQ用户",
                     groupId: msgPeer.chatType === ChatType.KCHATTYPEGROUP ? +msgPeer.peerUid : undefined,
                     time: Number(node.data.time) || Date.now(),
                     msg: sendElements,
@@ -241,7 +241,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         const finallySendElements = uploadReturnData?.finallySendElements;
         if (!finallySendElements) throw Error('转发消息失败，生成节点为空');
         returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], [], true).catch(_ => undefined);
-        return {message: returnMsg ?? null, res_id};
+        return { message: returnMsg ?? null, res_id };
     }
 
     private async handleForwardedNodes(destPeer: Peer, messageNodes: OB11MessageNode[]): Promise<{

src/onebot/types/message.ts

@@ -150,7 +150,9 @@ export interface OB11MessageNode {
     data: {
         id?: string
         user_id?: number | string  // number
+        uin?: number | string  // number, compatible with go-cqhttp
         nickname: string
+        name?: string // compatible with go-cqhttp
         content: OB11MessageMixType
         source?: string,
         news?: { text: string }[],

src/webui/ui/NapCat.ts

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V3.1.9', 'napcat-update-button', 'secondary'),
+                    SettingButton('V3.1.10', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([

static/assets/renderer.js

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