fix: poke report

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.2.21",
+  "version": "4.2.22",
   "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/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.2.21';
+export const napCatVersion = '4.2.22';

src/core/apis/user.ts

@@ -170,6 +170,9 @@ export class NTQQUserApi {
     }
 
     async getUidByUinV2(Uin: string) {
+        if (!Uin) {
+            return '';
+        }
         const services = [
             () => this.context.session.getUixConvertService().getUid([Uin]).then((data) => data.uidInfo.get(Uin)).catch(() => undefined),
             () => promisify<string, string[], Map<string, string>>
@@ -188,6 +191,9 @@ export class NTQQUserApi {
     }
 
     async getUinByUidV2(Uid: string) {
+        if (!Uid) {
+            return '0';
+        }
         const services = [
             () => this.context.session.getUixConvertService().getUin([Uid]).then((data) => data.uinInfo.get(Uid)).catch(() => undefined),
             () => this.context.session.getGroupService().getUinByUids([Uid]).then((data) => data.uins.get(Uid)).catch(() => undefined),

src/core/types/element.ts

@@ -29,6 +29,7 @@ export interface TextElement {
 }
 
 export interface FaceElement {
+    pokeType?: number;
     faceIndex: number;
     faceType: FaceType;
     faceText?: string;

src/onebot/action/extends/GetGroupAddRequest.ts

@@ -2,32 +2,44 @@ import { GroupNotifyMsgStatus } from '@/core';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 
-interface OB11GroupRequestNotify {
-    group_id: number,
-    user_id: number,
-    flag: string
+interface Notify {
+    request_id: string;
+    invitor_uin: number;
+    invitor_nick?: string;
+    group_id?: number;
+    group_name?: string;
+    checked: boolean;
+    requester_nick?: string;
+    actor: number;
 }
 
-export default class GetGroupAddRequest extends OneBotAction<null, OB11GroupRequestNotify[] | null> {
+export default class GetGroupAddRequest extends OneBotAction<null, Notify[] | null> {
     actionName = ActionName.GetGroupIgnoreAddRequest;
 
-    async _handle(payload: null): Promise<OB11GroupRequestNotify[] | null> {
-        const ignoredNotifies = await this.core.apis.GroupApi.getSingleScreenNotifies(true, 10);
-        const retData: any = {
-            join_requests: await Promise.all(
-                ignoredNotifies
-                    .filter(notify => notify.type === 7)
-                    .map(async SSNotify => ({
-                        request_id: SSNotify.group.groupCode + '|' + SSNotify.seq + '|' + SSNotify.type,
-                        requester_uin: await this.core.apis.UserApi.getUinByUidV2(SSNotify.user1?.uid),
-                        requester_nick: SSNotify.user1?.nickName,
-                        group_id: SSNotify.group?.groupCode,
-                        group_name: SSNotify.group?.groupName,
-                        checked: SSNotify.status !== GroupNotifyMsgStatus.KUNHANDLE,
-                        actor: await this.core.apis.UserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
-                    }))),
-        };
+    async _handle(payload: null): Promise<Notify[] | null> {
+        const NTQQUserApi = this.core.apis.UserApi;
+        const NTQQGroupApi = this.core.apis.GroupApi;
+        const ignoredNotifies = await NTQQGroupApi.getSingleScreenNotifies(true, 10);
+        const retData: Notify[] = [];
+
+        const notifyPromises = ignoredNotifies
+            .filter(notify => notify.type === 7)
+            .map(async SSNotify => {
+                const invitorUin = SSNotify.user1?.uid ? +await NTQQUserApi.getUinByUidV2(SSNotify.user1.uid) : 0;
+                const actorUin = SSNotify.user2?.uid ? +await NTQQUserApi.getUinByUidV2(SSNotify.user2.uid) : 0;
+                retData.push({
+                    request_id: `${SSNotify.group.groupCode}|${SSNotify.seq}|${SSNotify.type}`,
+                    invitor_uin: invitorUin,
+                    requester_nick: SSNotify.user1?.nickName,
+                    group_id: +SSNotify.group?.groupCode,
+                    group_name: SSNotify.group?.groupName,
+                    checked: SSNotify.status !== GroupNotifyMsgStatus.KUNHANDLE,
+                    actor: actorUin,
+                });
+            });
+
+        await Promise.all(notifyPromises);
 
         return retData;
     }
-}
+}

src/onebot/action/group/GetGroupIgnoredNotifies.ts

@@ -1,26 +1,55 @@
 import { GroupNotifyMsgStatus } from '@/core';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-export class GetGroupIgnoredNotifies extends OneBotAction<void, any> {
-    actionName = ActionName.GetGroupIgnoredNotifies;
 
-    async _handle(payload: void) {
-        const ignoredNotifies = await this.core.apis.GroupApi.getSingleScreenNotifies(true, 10);
-        const retData: any = {
-            join_requests: await Promise.all(
-                ignoredNotifies
-                    .filter(notify => notify.type === 7)
-                    .map(async SSNotify => ({
-                        request_id: SSNotify.group.groupCode + '|' + SSNotify.seq + '|' + SSNotify.type,
-                        requester_uin: await this.core.apis.UserApi.getUinByUidV2(SSNotify.user1?.uid),
-                        requester_nick: SSNotify.user1?.nickName,
-                        group_id: SSNotify.group?.groupCode,
-                        group_name: SSNotify.group?.groupName,
-                        checked: SSNotify.status !== GroupNotifyMsgStatus.KUNHANDLE,
-                        actor: await this.core.apis.UserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
-                    }))),
-        };
+interface Notify {
+    request_id: string;
+    invitor_uin: number;
+    invitor_nick?: string;
+    group_id?: number;
+    group_name?: string;
+    checked: boolean;
+    requester_nick?: string;
+    actor: number;
+}
+interface RetData {
+    InvitedRequest: Notify[];
+    join_requests: Notify[];
+}
+
+export class GetGroupIgnoredNotifies extends OneBotAction<void, RetData> {
+    actionName = ActionName.GetGroupSystemMsg;
+
+    async _handle(): Promise<RetData> {
+        const NTQQUserApi = this.core.apis.UserApi;
+        const NTQQGroupApi = this.core.apis.GroupApi;
+        const SingleScreenNotifies = await NTQQGroupApi.getSingleScreenNotifies(false, 50);
+        const retData: RetData = { InvitedRequest: [], join_requests: [] };
+
+        const notifyPromises = SingleScreenNotifies.map(async (SSNotify) => {
+            const invitorUin = SSNotify.user1?.uid ? +await NTQQUserApi.getUinByUidV2(SSNotify.user1.uid) : 0;
+            const actorUin = SSNotify.user2?.uid ? +await NTQQUserApi.getUinByUidV2(SSNotify.user2.uid) : 0;
+
+            const commonData = {
+                request_id: `${SSNotify.group.groupCode}|${SSNotify.seq}|${SSNotify.type}`,
+                invitor_uin: invitorUin,
+                invitor_nick: SSNotify.user1?.nickName,
+                group_id: +SSNotify.group?.groupCode,
+                group_name: SSNotify.group?.groupName,
+                checked: SSNotify.status !== GroupNotifyMsgStatus.KUNHANDLE,
+                actor: actorUin,
+                requester_nick: SSNotify.user1?.nickName,
+            };
+
+            if (SSNotify.type === 1) {
+                retData.InvitedRequest.push(commonData);
+            } else if (SSNotify.type === 7) {
+                retData.join_requests.push(commonData);
+            }
+        });
+
+        await Promise.all(notifyPromises);
 
         return retData;
     }
-}
+}

src/onebot/action/system/GetSystemMsg.ts

@@ -1,38 +1,63 @@
 import { GroupNotifyMsgStatus } from '@/core';
 import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
-export class GetGroupSystemMsg extends OneBotAction<void, any> {
+
+interface Notify {
+    request_id: string;
+    invitor_uin: number;
+    invitor_nick?: string;
+    group_id?: number;
+    group_name?: string;
+    checked: boolean;
+    actor: number;
+}
+
+interface JoinRequest extends Notify {
+    requester_nick?: string;
+}
+
+interface RetData {
+    InvitedRequest: Notify[];
+    join_requests: JoinRequest[];
+}
+
+export class GetGroupSystemMsg extends OneBotAction<void, RetData> {
     actionName = ActionName.GetGroupSystemMsg;
 
-    async _handle() {
+    async _handle(): Promise<RetData> {
         const NTQQUserApi = this.core.apis.UserApi;
         const NTQQGroupApi = this.core.apis.GroupApi;
-        // 默认10条 该api未完整实现 包括响应数据规范化 类型规范化 
-        const SingleScreenNotifies = await NTQQGroupApi.getSingleScreenNotifies(false, 10);
-        const retData: any = { InvitedRequest: [], join_requests: [] };
-        for (const SSNotify of SingleScreenNotifies) {
-            if (SSNotify.type == 1) {
+        const SingleScreenNotifies = await NTQQGroupApi.getSingleScreenNotifies(false, 50);
+        const retData: RetData = { InvitedRequest: [], join_requests: [] };
+
+        const notifyPromises = SingleScreenNotifies.map(async (SSNotify) => {
+            const invitorUin = SSNotify.user1?.uid ? +await NTQQUserApi.getUinByUidV2(SSNotify.user1.uid) : 0;
+            const actorUin = SSNotify.user2?.uid ? +await NTQQUserApi.getUinByUidV2(SSNotify.user2.uid) : 0;
+
+            if (SSNotify.type === 1) {
                 retData.InvitedRequest.push({
-                    request_id: SSNotify.group.groupCode + '|' + SSNotify.seq + '|' + SSNotify.type,
-                    invitor_uin: await NTQQUserApi.getUinByUidV2(SSNotify.user1?.uid),
+                    request_id: `${SSNotify.group.groupCode}|${SSNotify.seq}|${SSNotify.type}`,
+                    invitor_uin: invitorUin,
                     invitor_nick: SSNotify.user1?.nickName,
-                    group_id: SSNotify.group?.groupCode,
+                    group_id: +SSNotify.group?.groupCode,
                     group_name: SSNotify.group?.groupName,
-                    checked: SSNotify.status === GroupNotifyMsgStatus.KUNHANDLE ? false : true,
-                    actor: await NTQQUserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
+                    checked: SSNotify.status !== GroupNotifyMsgStatus.KUNHANDLE,
+                    actor: actorUin,
                 });
-            } else if (SSNotify.type == 7) {
+            } else if (SSNotify.type === 7) {
                 retData.join_requests.push({
-                    request_id: SSNotify.group.groupCode + '|' + SSNotify.seq + '|' + SSNotify.type,
-                    requester_uin: await NTQQUserApi.getUinByUidV2(SSNotify.user1?.uid),
+                    request_id: `${SSNotify.group.groupCode}|${SSNotify.seq}|${SSNotify.type}`,
+                    invitor_uin: invitorUin,
                     requester_nick: SSNotify.user1?.nickName,
-                    group_id: SSNotify.group?.groupCode,
+                    group_id: +SSNotify.group?.groupCode,
                     group_name: SSNotify.group?.groupName,
-                    checked: SSNotify.status === GroupNotifyMsgStatus.KUNHANDLE ? false : true,
-                    actor: await NTQQUserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
+                    checked: SSNotify.status !== GroupNotifyMsgStatus.KUNHANDLE,
+                    actor: actorUin,
                 });
             }
-        }
+        });
+
+        await Promise.all(notifyPromises);
 
         return retData;
     }

src/onebot/api/msg.ts

@@ -153,6 +153,17 @@ export class OneBotMsgApi {
 
         faceElement: async element => {
             const faceIndex = element.faceIndex;
+            if (element.faceType == FaceType.Poke) {
+                return {
+                    type: OB11MessageDataType.poke,
+                    data: {
+                        type: element?.pokeType?.toString() ?? '0',
+                        id: faceIndex.toString(),
+                    }
+                }
+
+            }
+
             if (faceIndex === FaceIndex.DICE) {
                 return {
                     type: OB11MessageDataType.dice,

src/onebot/types/message.ts

@@ -71,6 +71,14 @@ export enum OB11MessageDataType {
     location = 'location'
 }
 
+export interface OB11MessagePoke {
+    type: OB11MessageDataType.poke;
+    data: {
+        type: string;
+        id: string;
+    };
+}
+
 // 商城表情消息接口定义
 export interface OB11MessageMFace {
     type: OB11MessageDataType.mface;
@@ -247,7 +255,7 @@ export type OB11MessageData =
     OB11MessageAt | OB11MessageReply |
     OB11MessageImage | OB11MessageRecord | OB11MessageFile | OB11MessageVideo |
     OB11MessageNode | OB11MessageIdMusic | OB11MessageCustomMusic | OB11MessageJson |
-    OB11MessageDice | OB11MessageRPS | OB11MessageMarkdown | OB11MessageForward | OB11MessageContext;
+    OB11MessageDice | OB11MessageRPS | OB11MessageMarkdown | OB11MessageForward | OB11MessageContext | OB11MessagePoke;
 
 // 发送消息接口定义
 export interface OB11PostSendMsg {