fix #186

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "scripts": {
     "watch:dev": "vite --mode development",
     "watch:prod": "vite --mode production",

src/common/utils/helper.ts

@@ -8,6 +8,27 @@ import * as fsPromise from 'node:fs/promises';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
+
+//下面这个类是用于将uid+msgid合并的类
+export class UUIDConverter {
+  static encode(highStr: string, lowStr: string): string {
+    const high = BigInt(highStr);
+    const low = BigInt(lowStr);
+    const highHex = high.toString(16).padStart(16, '0');
+    const lowHex = low.toString(16).padStart(16, '0');
+    const combinedHex = highHex + lowHex;
+    const uuid = `${combinedHex.substring(0, 8)}-${combinedHex.substring(8, 12)}-${combinedHex.substring(12, 16)}-${combinedHex.substring(16, 20)}-${combinedHex.substring(20)}`;
+    return uuid;
+  }
+  static decode(uuid: string): { high: string, low: string } {
+    const hex = uuid.replace(/-/g, '');
+    const high = BigInt('0x' + hex.substring(0, 16));
+    const low = BigInt('0x' + hex.substring(16));
+    return { high: high.toString(), low: low.toString() };
+  }
+}
+
+
 export function sleep(ms: number): Promise<void> {
   return new Promise(resolve => setTimeout(resolve, ms));
 }

src/common/utils/version.ts

@@ -4,10 +4,10 @@ export async function checkVersion(): Promise<string> {
   return new Promise(async (resolve, reject) => {
     const MirrorList =
       [
+        'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json',
         'https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
         'https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
-        'https://cdn.jsdelivr.us/gh/NapNeko/NapCatQQ@main/package.json',
-        'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json'
+        'https://cdn.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json'
       ];
     let version = undefined;
     for (const url of MirrorList) {

src/core/src/apis/file.ts

@@ -18,6 +18,7 @@ import { sessionConfig } from '@/core/sessionConfig';
 import { rkeyManager } from '../utils/rkey';
 import { NTEventDispatch } from '@/common/utils/EventTask';
 import { NodeIKernelSearchService } from '../services/NodeIKernelSearchService';
+import { selfInfo } from '../data';
 
 
 export class NTQQFileApi {
@@ -67,7 +68,9 @@ export class NTQQFileApi {
       ext
     };
   }
-
+  static async downloadMediaByUuid() {
+    //napCatCore.session.getRichMediaService().downloadFileForFileUuid();
+  }
   static async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
     //logDebug('receive downloadMedia task', msgId, chatType, peerUid, elementId, thumbPath, sourcePath, timeout, force);
     // 用于下载收到的消息中的图片等

src/core/src/apis/msg.ts

@@ -8,7 +8,8 @@ import { GeneralCallResult } from '@/core/services/common';
 import { MessageUnique } from '../../../common/utils/MessageUnique';
 import { NTEventDispatch } from '@/common/utils/EventTask';
 import { logNotice } from '@/onebot11/log';
-let MsgSendMode = 2;
+import { c } from 'vite/dist/node/types.d-aGj9QkWt';
+//let MsgSendMode = 2;
 
 async function LoadMessageIdList(Peer: Peer, msgId: string) {
   let msgList = await NTQQMsgApi.getMsgHistory(Peer, msgId, 50);
@@ -42,7 +43,7 @@ async function loadMessageUnique() {
 setTimeout(() => {
   napCatCore.onLoginSuccess(async () => {
     await sleep(100);
-    NTQQMsgApi.CheckSendMode().then().catch();
+    // NTQQMsgApi.CheckSendMode().then().catch();
     loadMessageUnique().then().catch();
   });
 }, 100);
@@ -65,25 +66,25 @@ setTimeout(() => {
 //   console.log(await NTQQMsgApi.multiForwardMsg(peer, peer, [MsgId]));
 // }, 25000)
 export class NTQQMsgApi {
-  static async CheckSendMode() {
-    try {
-      NTQQMsgApi.sendMsgV2({ chatType: 1, peerUid: selfInfo.uid }, [SendMsgElementConstructor.text('消息队列模式测试')], true, 10000).then().catch();
-      MsgSendMode = 2;
-      logNotice('[消息队列] 消息模式确认: MsgId异步队列');
-      return true;
-    } catch (error) {
-      logNotice('[消息队列] 消息模式失败: MsgId异步队列');
-    }
-    try {
-      NTQQMsgApi.sendMsgV1({ chatType: 1, peerUid: selfInfo.uid }, [SendMsgElementConstructor.text('消息队列模式测试')], true, 10000).then().catch();
-      MsgSendMode = 1;
-      logNotice('[消息队列] 消息模式确认: MsgSeq异步队列');
-      return true;
-    } catch (error) {
-      logNotice('[消息队列] 消息模式失败: MsgSeq异步队列');
-    }
-    return false;
-  }
+  // static async CheckSendMode() {
+  //   try {
+  //     NTQQMsgApi.sendMsgV2({ chatType: 1, peerUid: selfInfo.uid }, [SendMsgElementConstructor.text('消息队列模式测试')], true, 10000).then().catch();
+  //     MsgSendMode = 2;
+  //     logNotice('[消息队列] 消息模式确认: MsgId异步队列');
+  //     return true;
+  //   } catch (error) {
+  //     logNotice('[消息队列] 消息模式失败: MsgId异步队列');
+  //   }
+  //   try {
+  //     NTQQMsgApi.sendMsgV1({ chatType: 1, peerUid: selfInfo.uid }, [SendMsgElementConstructor.text('消息队列模式测试')], true, 10000).then().catch();
+  //     MsgSendMode = 1;
+  //     logNotice('[消息队列] 消息模式确认: MsgSeq异步队列');
+  //     return true;
+  //   } catch (error) {
+  //     logNotice('[消息队列] 消息模式失败: MsgSeq异步队列');
+  //   }
+  //   return false;
+  // }
   // static napCatCore: NapCatCore | null = null;
   //   enum BaseEmojiType {
   //     NORMAL_EMOJI,
@@ -153,7 +154,7 @@ export class NTQQMsgApi {
       (GroupCode: string, params: GetFileListParam) => Promise<unknown>,
       (groupFileListResult: onGroupFileInfoUpdateParamType) => void
     >(
-      'NodeIKernelRichMediaService/sendMsg',
+      'NodeIKernelRichMediaService/getGroupFileList',
       'NodeIKernelMsgListener/onGroupFileInfoUpdate',
       1,
       5000,
@@ -175,7 +176,7 @@ export class NTQQMsgApi {
       peerUid: peer.peerUid
     }, msgIds);
   }
-  static async sendMsgV2(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
+  static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
     // function generateMsgId() {
     //   const timestamp = Math.floor(Date.now() / 1000);
     //   const random = Math.floor(Math.random() * Math.pow(2, 32));
@@ -185,6 +186,7 @@ export class NTQQMsgApi {
     //   const msgId = BigInt("0x" + buffer.toString('hex')).toString();
     //   return msgId;
     // }
+    
     let msgId = await NTQQMsgApi.getMsgUnique(await NTQQMsgApi.getServerTime());
     let data = await NTEventDispatch.CallNormalEvent<
       (msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>) => Promise<unknown>,
@@ -214,13 +216,8 @@ export class NTQQMsgApi {
     });
     return retMsg;
   }
-  static sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-    if (MsgSendMode == 1) {
-      return NTQQMsgApi.sendMsgV1(peer, msgElements, waitComplete, timeout);
-    } else if (MsgSendMode == 2) {
-      return NTQQMsgApi.sendMsgV2(peer, msgElements, waitComplete, timeout);
-    }
-    throw new Error('未知的发送消息模式');
+  static sendMsgEx(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
+    //return NTQQMsgApi.sendMsgV1(peer, msgElements, waitComplete, timeout);
   }
   static async sendMsgV1(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
     let msgList = await NTQQMsgApi.getLastestMsgByUids(peer);
@@ -229,7 +226,7 @@ export class NTQQMsgApi {
       msgCurrentSeq = BigInt(msgList.msgList[0].msgSeq);
     }
     let rawMsg: RawMessage | undefined;
-    let EventListener = NTEventDispatch.RegisterListen<NodeIKernelMsgListener['onAddSendMsg']>('NodeIKernelMsgListener/onAddSendMsg', 1, timeout, (msg: RawMessage) => {
+    let onAddSendMsgListener = NTEventDispatch.RegisterListen<NodeIKernelMsgListener['onAddSendMsg']>('NodeIKernelMsgListener/onAddSendMsg', 1, timeout, (msg: RawMessage) => {
       //console.log("msgSeq:", msgCurrentSeq.toString(), JSON.stringify(msgList.msgList[0], null, 4));
       if (msg.peerUid == peer.peerUid && (msgCurrentSeq == 0n || msgList.msgList[0].msgSeq == msgCurrentSeq.toString())) {
         rawMsg = msg;
@@ -237,7 +234,7 @@ export class NTQQMsgApi {
       }
       return false;
     }).catch(logError);
-    let EventListener2 = NTEventDispatch.RegisterListen<NodeIKernelMsgListener['onMsgInfoListUpdate']>('NodeIKernelMsgListener/onMsgInfoListUpdate', 1, timeout,
+    let MsgInfoListUpdateListener = NTEventDispatch.RegisterListen<NodeIKernelMsgListener['onMsgInfoListUpdate']>('NodeIKernelMsgListener/onMsgInfoListUpdate', 1, timeout,
       (msgList: RawMessage[]) => {
         for (let msg of msgList) {
           if (msg.peerUid == peer.peerUid && rawMsg && rawMsg.msgId == msg.msgId && msg.sendStatus == 2) {
@@ -247,10 +244,16 @@ export class NTQQMsgApi {
         }
         return false;
       }).catch(logError);
-    await NTEventDispatch.CallNoListenerEvent<NodeIKernelMsgService['sendMsg']>('NodeIKernelMsgService/sendMsg', timeout, "0", peer, msgElements, new Map());
-    await EventListener;
-    await EventListener2;
-   // console.log("rawMsg", JSON.stringify(rawMsg, null, 4));
+    let data = await napCatCore.session.getMsgService().sendMsg("0", peer, msgElements, new Map());
+    //await NTEventDispatch.CallNoListenerEvent<NodeIKernelMsgService['sendMsg']>('NodeIKernelMsgService/sendMsg', timeout, "0", peer, msgElements, new Map());
+    await onAddSendMsgListener;
+    if (data.result !== 0 && rawMsg) {
+      //发送失败msgid
+      await napCatCore.session.getMsgService().deleteMsg(peer, [rawMsg.msgId]);
+      throw new Error('发送消息失败');
+    }
+    await MsgInfoListUpdateListener;
+    // console.log("rawMsg", JSON.stringify(rawMsg, null, 4));
     if (rawMsg) {
       return rawMsg;
     }

src/core/src/entities/notify.ts

@@ -62,6 +62,7 @@ export enum BuddyReqType {
   KMEINITIATORWAITPEERCONFIRM
 }
 export interface FriendRequest {
+  isInitiator?: boolean;
   isDecide: boolean;
   friendUid: string;
   reqType: BuddyReqType,

src/core/src/services/NodeIKernelMsgService.ts

@@ -5,7 +5,7 @@ import { GeneralCallResult } from '@/core/services/common';
 export interface NodeIKernelMsgService {
   addKernelMsgListener(nodeIKernelMsgListener: NodeIKernelMsgListener): number;
 
-  sendMsg(msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>): Promise<unknown>;
+  sendMsg(msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<any, any>): Promise<GeneralCallResult>;
 
   recallMsg(peer: Peer, msgIds: string[]): Promise<GeneralCallResult>;
 
@@ -117,7 +117,7 @@ export interface NodeIKernelMsgService {
 
   addLocalRecordMsg(Peer: Peer, msgId: string, ele: MessageElement, attr: Array<any> | number, front: boolean): Promise<unknown>;
 
-  deleteMsg(...args: unknown[]): unknown;
+  deleteMsg(Peer: Peer, msgIds: Array<string>): Promise<any>;
 
   updateElementExtBufForUI(...args: unknown[]): unknown;
 

src/core/src/services/NodeIKernelRichMediaService.ts

@@ -200,8 +200,6 @@ export interface NodeIKernelRichMediaService {
 
     getGroupFileInfo(arg1: unknown, arg2: unknown): unknown;
 
-    getGroupFileList(arg1: unknown, arg2: unknown): unknown;
-
     getGroupTransferList(arg1: unknown, arg2: unknown): unknown;
 
     renameGroupFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown;

src/onebot11/action/file/GetFile.ts

@@ -1,15 +1,12 @@
 import BaseAction from '../BaseAction';
 import fs from 'fs/promises';
 import { ob11Config } from '@/onebot11/config';
-import { log, logDebug } from '@/common/utils/log';
-import { sleep } from '@/common/utils/helper';
-import { uri2local } from '@/common/utils/file';
+import { UUIDConverter } from '@/common/utils/helper';
 import { ActionName, BaseCheckResult } from '../types';
-import { ChatType, FileElement, Peer, RawMessage, VideoElement } from '@/core/entities';
-import { NTQQFileApi, NTQQMsgApi } from '@/core/apis';
+import { ChatType, ElementType, FileElement, Peer, RawMessage, VideoElement } from '@/core/entities';
+import { NTQQFileApi, NTQQFriendApi, NTQQMsgApi, NTQQUserApi } from '@/core/apis';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import Ajv from 'ajv';
-import { MessageUnique } from '@/common/utils/MessageUnique';
+import { getGroup } from '@/core/data';
 
 export interface GetFilePayload {
   file: string; // 文件名或者fileUuid
@@ -46,6 +43,65 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
   }
   protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
     const { enableLocalFile2Url } = ob11Config;
+    let UuidData: {
+      high: string;
+      low: string;
+    } | undefined;
+    try {
+      UuidData = UUIDConverter.decode(payload.file);
+      if (UuidData) {
+        let peerUin = UuidData.high;
+        let msgId = UuidData.low;
+        let isGroup = await getGroup(peerUin);
+        let peer: Peer | undefined;
+        //识别Peer
+        if (isGroup) {
+          peer = { chatType: ChatType.group, peerUid: peerUin };
+        }
+        let PeerUid = await NTQQUserApi.getUidByUin(peerUin);
+        if (PeerUid) {
+          let isBuddy = await NTQQFriendApi.isBuddy(PeerUid);
+          if (isBuddy) {
+            peer = { chatType: ChatType.friend, peerUid: PeerUid };
+          } else {
+            peer = { chatType: ChatType.temp, peerUid: PeerUid };
+          }
+        }
+        if (!peer) {
+          throw new Error('chattype not support');
+        }
+        let msgList = await NTQQMsgApi.getMsgsByMsgId(peer, [msgId]);
+        if (msgList.msgList.length == 0) {
+          throw new Error('msg not found');
+        }
+        let msg = msgList.msgList[0];
+        let findEle = msg.elements.find(e => e.elementType == ElementType.VIDEO || e.elementType == ElementType.FILE || e.elementType == ElementType.PTT);
+        if (!findEle) {
+          throw new Error('element not found');
+        }
+        let downloadPath = await NTQQFileApi.downloadMedia(msgId, msg.chatType, msg.peerUid, findEle.elementId, '', '');
+        let fileSize = findEle?.videoElement?.fileSize || findEle?.fileElement?.fileSize || findEle?.pttElement?.fileSize || '0';
+        let fileName = findEle?.videoElement?.fileName || findEle?.fileElement?.fileName || findEle?.pttElement?.fileName || '';
+        const res: GetFileResponse = {
+          file: downloadPath,
+          url: downloadPath,
+          file_size: fileSize,
+          file_name: fileName
+        };
+        if (enableLocalFile2Url) {
+          try {
+            res.base64 = await fs.readFile(downloadPath, 'base64');
+          } catch (e) {
+            throw new Error('文件下载失败. ' + e);
+          }
+        }
+        //不手动删除？文件持久化了
+        return res;
+      }
+    } catch {
+
+    }
+
     const NTSearchNameResult = (await NTQQFileApi.searchfile([payload.file])).resultItems;
     if (NTSearchNameResult.length !== 0) {
       const MsgId = NTSearchNameResult[0].msgId;
@@ -69,7 +125,7 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
       const res: GetFileResponse = {
         file: downloadPath,
         url: downloadPath,
-        file_size:  NTSearchNameResult[0].fileSize.toString(),
+        file_size: NTSearchNameResult[0].fileSize.toString(),
         file_name: NTSearchNameResult[0].fileName
       };
       if (enableLocalFile2Url) {
@@ -82,7 +138,6 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
       //不手动删除？文件持久化了
       return res;
     }
-    //下面逻辑是有UUID的情况
     throw new Error('file not found');
     // let cache = await dbUtil.getFileCacheByName(payload.file);
     // if (!cache) {

src/onebot11/action/msg/GetMsg.ts

@@ -32,10 +32,18 @@ class GetMsg extends BaseAction<Payload, OB11Message> {
     if (!msgIdWithPeer) {
       throw ('消息不存在');
     }
+    const peer = { guildId: '', peerUid: msgIdWithPeer?.Peer.peerUid, chatType: msgIdWithPeer.Peer.chatType };
     const msg = await NTQQMsgApi.getMsgsByMsgId(
-      { guildId: '', peerUid: msgIdWithPeer?.Peer.peerUid, chatType: msgIdWithPeer.Peer.chatType },
+      peer,
       [msgIdWithPeer?.MsgId || payload.message_id.toString()]);
-    return await OB11Constructor.message(msg.msgList[0]);
+    let retMsg = await OB11Constructor.message(msg.msgList[0]);
+    try {
+      retMsg.message_id = MessageUnique.createMsg(peer, msg.msgList[0].msgId)!;
+      retMsg.message_seq = retMsg.message_id;
+      retMsg.real_id = retMsg.message_id;
+    } catch (e) {
+    }
+    return retMsg;
   }
 }
 

src/onebot11/constructor.ts

@@ -35,7 +35,7 @@ import { OB11GroupNoticeEvent } from './event/notice/OB11GroupNoticeEvent';
 
 import { calcQQLevel } from '../common/utils/qqlevel';
 import { log, logDebug, logError, logWarn } from '../common/utils/log';
-import { sleep } from '../common/utils/helper';
+import { sleep, UUIDConverter } from '../common/utils/helper';
 import { OB11GroupTitleEvent } from './event/notice/OB11GroupTitleEvent';
 import { OB11GroupCardEvent } from './event/notice/OB11GroupCardEvent';
 import { OB11GroupDecreaseEvent } from './event/notice/OB11GroupDecreaseEvent';
@@ -185,13 +185,12 @@ export class OB11Constructor {
         message_data['data']['file_size'] = element.picElement.fileSize;
       }
       else if (element.fileElement) {
-
         const FileElement = element.fileElement;
         message_data['type'] = OB11MessageDataType.file;
         message_data['data']['file'] = FileElement.fileName;
         message_data['data']['path'] = FileElement.filePath;
         message_data['data']['url'] = FileElement.filePath;
-        message_data['data']['file_id'] = FileElement.fileUuid;
+        message_data['data']['file_id'] =  UUIDConverter.encode(msg.peerUin, msg.msgId);
         message_data['data']['file_size'] = FileElement.fileSize;
         await NTQQFileApi.addFileCache({
           peerUid: msg.peerUid,
@@ -237,7 +236,7 @@ export class OB11Constructor {
         message_data['data']['file'] = videoElement.fileName;
         message_data['data']['path'] = videoDownUrl;
         message_data['data']['url'] = videoDownUrl;
-        message_data['data']['file_id'] = videoElement.fileUuid;
+        message_data['data']['file_id'] = UUIDConverter.encode(msg.peerUin, msg.msgId);
         message_data['data']['file_size'] = videoElement.fileSize;
 
         await NTQQFileApi.addFileCache({
@@ -258,19 +257,9 @@ export class OB11Constructor {
         message_data['type'] = OB11MessageDataType.voice;
         message_data['data']['file'] = element.pttElement.fileName;
         message_data['data']['path'] = element.pttElement.filePath;
-        message_data['data']['file_id'] = element.pttElement.fileUuid;
+        //message_data['data']['file_id'] = element.pttElement.fileUuid;
+        message_data['data']['file_id'] = UUIDConverter.encode(msg.peerUin, msg.msgId);
         message_data['data']['file_size'] = element.pttElement.fileSize;
-        // dbUtil.addFileCache({
-        //   name: element.pttElement.fileName,
-        //   path: element.pttElement.filePath,
-        //   size: parseInt(element.pttElement.fileSize) || 0,
-        //   url: '',
-        //   uuid: element.pttElement.fileUuid || '',
-        //   msgId: msg.msgId,
-        //   element: element.pttElement,
-        //   elementType: ElementType.PTT,
-        //   elementId: element.elementId
-        // }).then();
         await NTQQFileApi.addFileCache({
           peerUid: msg.peerUid,
           chatType: msg.chatType,
@@ -350,6 +339,7 @@ export class OB11Constructor {
       if (element.grayTipElement) {
         if (element.grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE) {
           const json = JSON.parse(element.grayTipElement.jsonGrayTipElement.jsonStr);
+
           if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
             //判断业务类型
             //Poke事件
@@ -358,7 +348,7 @@ export class OB11Constructor {
             pokedetail = pokedetail.filter(item => item.uid);
             //console.log("[NapCat] 群拍一拍 群:", pokedetail, parseInt(msg.peerUid), " ", await NTQQUserApi.getUinByUid(pokedetail[0].uid), "拍了拍", await NTQQUserApi.getUinByUid(pokedetail[1].uid));
             if (pokedetail.length == 2) {
-              return new OB11FriendPokeEvent(parseInt((await NTQQUserApi.getUinByUid(pokedetail[0].uid))!), parseInt((await NTQQUserApi.getUinByUid(pokedetail[1].uid))!));
+              return new OB11FriendPokeEvent(parseInt((await NTQQUserApi.getUinByUid(pokedetail[0].uid))!), parseInt((await NTQQUserApi.getUinByUid(pokedetail[1].uid))!), pokedetail);
             }
           }
           //下面得改 上面也是错的grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE

src/onebot11/event/notice/OB11PokeEvent.ts

@@ -10,22 +10,25 @@ class OB11PokeEvent extends OB11BaseNoticeEvent {
 }
 
 export class OB11FriendPokeEvent extends OB11PokeEvent {
-  constructor(user_id: number, target_id: number) {
+  raw_info: any;
+  //raw_message nb等框架标准为string
+  constructor(user_id: number, target_id: number, raw_message: any) {
     super();
     this.target_id = target_id;
     this.user_id = user_id;
+    this.raw_info = raw_message;
   }
 }
 
 export class OB11GroupPokeEvent extends OB11PokeEvent {
   group_id: number;
-  raw_message: any;
-
+  raw_info: any;
+  //raw_message nb等框架标准为string
   constructor(group_id: number, user_id: number = 0, target_id: number = 0, raw_message: any) {
     super();
     this.group_id = group_id;
     this.target_id = target_id;
     this.user_id = user_id;
-    this.raw_message = raw_message;
+    this.raw_info = raw_message;
   }
 }

src/onebot11/main.ts

@@ -241,7 +241,7 @@ export class NapCatOnebot11 {
     msgListener.onMsgInfoListUpdate = (msgList) => {
       this.postRecallMsg(msgList).then().catch(logError);
       for (const msg of msgList.filter(e => e.senderUin == selfInfo.uin)) {
-      //  console.log(msg);
+        //  console.log(msg);
         if (msg.sendStatus !== 2) {
           //完成后再post
           return;
@@ -594,7 +594,7 @@ export class NapCatOnebot11 {
 
   async postFriendRequest(reqs: FriendRequest[]) {
     for (const req of reqs) {
-      if (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM) {
+      if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM)) {
         continue;
       }
       const friendRequestEvent = new OB11FriendRequestEvent();

src/onebot11/version.ts

@@ -1 +1 @@
-export const version = '1.7.2';
+export const version = '1.7.3';

src/webui/ui/NapCat.ts

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

static/assets/renderer.js

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