release: 2.2.29

fix: 群成员信息

.github/workflows/build.yml

@@ -1,15 +1,11 @@
 name: "Build Action"
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - main
 
 permissions: write-all
 
 jobs:
   Build-LiteLoader:
-    if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
     runs-on: ubuntu-latest
     steps:
     - name: Clone Main Repository
@@ -37,7 +33,6 @@ jobs:
         name: NapCat.Framework
         path: dist
   Build-Shell:
-    if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
     runs-on: ubuntu-latest
     steps:
         - name: Clone Main Repository
@@ -63,4 +58,4 @@ jobs:
           uses: actions/upload-artifact@v4
           with:
               name: NapCat.Shell
-              path: dist
+              path: dist

manifest.json

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

package.json

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

src/common/helper.ts

@@ -23,29 +23,33 @@ export async function solveAsyncProblem<T extends (...args: any[]) => Promise<an
         });
     });
 }
+
 export class FileNapCatOneBotUUID {
     static encodeModelId(peer: Peer, modelId: string): string {
-        return `NapCatOneBot-ModeldFile-${peer.chatType}-${peer.peerUid}-${modelId}`;
+        return `NapCatOneBot-ModelIdFile-${peer.chatType}-${peer.peerUid}-${modelId}`;
     }
+
     static decodeModelId(uuid: string): undefined | {
         peer: Peer,
         modelId: string
     } {
-        if (!uuid.startsWith('NapCatOneBot-ModeldFile-')) return undefined;
+        if (!uuid.startsWith('NapCatOneBot-ModelIdFile-')) return undefined;
         const data = uuid.split('-');
         if (data.length !== 5) return undefined;
         const [, , chatType, peerUid, modelId] = data;
         return {
             peer: {
                 chatType: chatType as any,
-                peerUid: peerUid
+                peerUid: peerUid,
             },
             modelId,
         };
     }
+
     static encode(peer: Peer, msgId: string, elementId: string): string {
         return `NapCatOneBot-MsgFile-${peer.chatType}-${peer.peerUid}-${msgId}-${elementId}`;
     }
+
     static decode(uuid: string): undefined | {
         peer: Peer,
         msgId: string,
@@ -58,13 +62,14 @@ export class FileNapCatOneBotUUID {
         return {
             peer: {
                 chatType: chatType as any,
-                peerUid: peerUid
+                peerUid: peerUid,
             },
             msgId,
             elementId,
         };
     }
 }
+
 export function sleep(ms: number): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '2.2.27';
+export const napCatVersion = '2.2.29';

src/core/apis/file.ts

@@ -302,11 +302,11 @@ export class NTQQFileApi {
     async downloadMediaByUuid() {
         //napCatCore.session.getRichMediaService().downloadFileForFileUuid();
     }
-    async downloadFileForModelId(peer: Peer, modelId: string, timeout = 1000 * 60 * 2) {
+    async downloadFileForModelId(peer: Peer, modelId: string, unknown: string, timeout = 1000 * 60 * 2) {
         const [, fileTransNotifyInfo] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelRichMediaService/downloadFileForModelId',
             'NodeIKernelMsgListener/onRichMediaDownloadComplete',
-            [peer, [modelId]],
+            [peer, [modelId], unknown],
             () => true,
             (arg) => arg?.commonFileInfo?.fileModelId === modelId,
             1,

src/core/services/NodeIKernelRichMediaService.ts

@@ -155,7 +155,7 @@ export interface NodeIKernelRichMediaService {
     }): unknown;
 
     //arg3为“”
-    downloadFileForModelId(peer: Peer, ModelId: string[]): Promise<unknown>;
+    downloadFileForModelId(peer: Peer, ModelId: string[], unknown: string): Promise<unknown>;
 
     //第三个参数 Array<Type>
     // this.fileId = "";

src/onebot/action/file/GetFile.ts

@@ -31,8 +31,8 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
         const NTQQMsgApi = this.core.apis.MsgApi;
         const NTQQFileApi = this.core.apis.FileApi;
 
-        const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file);
         //接收消息标记模式
+        const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file);
         if (contextMsgFile) {
             const { peer, msgId, elementId } = contextMsgFile;
             const downloadPath = await NTQQFileApi.downloadMedia(msgId, peer.chatType, peer.peerUid, elementId, '', '');
@@ -64,7 +64,7 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
         const contextModelIdFile = FileNapCatOneBotUUID.decodeModelId(payload.file);
         if (contextModelIdFile) {
             const { peer, modelId } = contextModelIdFile;
-            const downloadPath = await NTQQFileApi.downloadFileForModelId(peer, modelId);
+            const downloadPath = await NTQQFileApi.downloadFileForModelId(peer, modelId, '');
             const res: GetFileResponse = {
                 file: downloadPath,
                 url: downloadPath,

src/onebot/action/file/GetGroupFileList.ts

@@ -41,7 +41,10 @@ export class GetGroupFileList extends BaseAction<Payload, { FileList: Array<any>
         ret.forEach((e) => {
             const fileModelId = e?.fileInfo?.fileModelId;
             if (fileModelId)
-                e.fileInfo!.fileId = FileNapCatOneBotUUID.encodeModelId({ chatType: 2, peerUid: payload.group_id.toString() }, fileModelId);
+                e.fileInfo!.fileId = FileNapCatOneBotUUID.encodeModelId({
+                    chatType: 2,
+                    peerUid: payload.group_id.toString()
+                }, fileModelId);
         });
         return { FileList: ret };
     }

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -31,18 +31,18 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
             NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache),
             NTQQUserApi.getUserDetailInfo(uid),
         ]);
-        if (member.status !== 'fulfilled') throw new Error(`群(${payload.group_id})成员${payload.user_id}不存在 ${member.reason}`);
+        if (member.status !== 'fulfilled') throw new Error(`群(${payload.group_id})成员${payload.user_id}获取失败 ${member.reason}`);
+        if (!member.value) throw new Error(`群(${payload.group_id})成员${payload.user_id}不存在`);
         if (info.status === 'fulfilled') {
-            this.core.context.logger.logDebug('群成员详细信息结果', info.value);
-            Object.assign(member, info.value);
+            Object.assign(member.value, info.value);
         } else {
             this.core.context.logger.logDebug(`获取群成员详细信息失败, 只能返回基础信息 ${info.reason}`);
         }
         const date = Math.round(Date.now() / 1000);
         const retMember = OB11Entities.groupMember(payload.group_id.toString(), member.value as GroupMember);
         const Member = await this.core.apis.GroupApi.getGroupMember(payload.group_id.toString(), retMember.user_id);
-        retMember.last_sent_time = parseInt(Member?.lastSpeakTime || date.toString());
-        retMember.join_time = parseInt(Member?.joinTime || date.toString());
+        retMember.last_sent_time = parseInt(Member?.lastSpeakTime ?? date.toString());
+        retMember.join_time = parseInt(Member?.joinTime ?? date.toString());
         return retMember;
     }
 }

src/onebot/api/group.ts

@@ -18,6 +18,7 @@ import { OB11GroupUploadNoticeEvent } from '@/onebot/event/notice/OB11GroupUploa
 import { OB11GroupPokeEvent } from '@/onebot/event/notice/OB11PokeEvent';
 import { OB11GroupEssenceEvent } from '@/onebot/event/notice/OB11GroupEssenceEvent';
 import { OB11GroupTitleEvent } from '@/onebot/event/notice/OB11GroupTitleEvent';
+import { FileNapCatOneBotUUID } from '@/common/helper';
 
 export class OneBotGroupApi {
     obContext: NapCatOneBot11Adapter;
@@ -76,7 +77,10 @@ export class OneBotGroupApi {
                     this.core,
                     parseInt(msg.peerUid), parseInt(msg.senderUin || ''),
                     {
-                        id: element.fileElement.fileUuid!,
+                        id: FileNapCatOneBotUUID.encode({
+                            chatType: ChatType.KCHATTYPEGROUP,
+                            peerUid: msg.peerUid,
+                        }, msg.msgId, element.elementId),
                         name: element.fileElement.fileName,
                         size: parseInt(element.fileElement.fileSize),
                         busid: element.fileElement.fileBizId || 0,
@@ -124,8 +128,8 @@ export class OneBotGroupApi {
                             peerUid: Group,
                         };
                         const msgData = await NTQQMsgApi.getMsgsBySeqAndCount(Peer, msgSeq.toString(), 1, true, true);
-                        let msgList = (await this.core.apis.WebApi.getGroupEssenceMsgAll(Group)).flatMap((e) => e.data.msg_list);
-                        let realMsg = msgList.find((e) => e.msg_seq.toString() == msgSeq);
+                        const msgList = (await this.core.apis.WebApi.getGroupEssenceMsgAll(Group)).flatMap((e) => e.data.msg_list);
+                        const realMsg = msgList.find((e) => e.msg_seq.toString() == msgSeq);
                         return new OB11GroupEssenceEvent(
                             this.core,
                             parseInt(msg.peerUid),

src/webui/ui/NapCat.ts

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V2.2.27', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.2.29', '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("V2.2.27", "napcat-update-button", "secondary")
+          SettingButton("V2.2.29", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([