feat: 修复一些问题

.gitignore

@@ -15,3 +15,5 @@ devconfig/*
 checkVersion.sh
 bun.lockb
 tests/run/
+guild1.db-wal
+guild1.db-shm

src/core/apis/friend.ts

@@ -17,8 +17,14 @@ export class NTQQFriendApi {
 
   async getBuddyV2SimpleInfoMap () {
     const buddyService = this.context.session.getBuddyService();
+    let uids: string[] = [];
+    if (this.core.context.basicInfoWrapper.requireMinNTQQBuild('40990')) {
+      const buddyListV2NT = await buddyService.getBuddyListV2('0', true, BuddyListReqType.KNOMAL);
+      uids = buddyListV2NT.data.flatMap(item => item.buddyUids);
+    } else {
       const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL);
-    const uids = buddyListV2.data.flatMap(item => item.buddyUids);
+      uids = buddyListV2.data.flatMap(item => item.buddyUids);
+    }
     return await this.core.eventWrapper.callNoListenerEvent(
       'NodeIKernelProfileService/getCoreAndBaseInfo',
       'nodeStore',

src/core/services/NodeIKernelBuddyService.ts

@@ -10,9 +10,20 @@ export interface NodeIKernelBuddyService {
       categroyName: string,
       categroyMbCount: number,
       onlineCount: number,
-      buddyUids: Array<string>
+      buddyUids: Array<string>;
-    }>
     }>;
+  }>;
+  getBuddyListV2 (callFrom: string, isPullRefresh: boolean, reqType: BuddyListReqType): Promise<GeneralCallResult & {
+    data: Array<{
+      categoryId: number,
+      categorySortId: number,
+      categroyName: string,
+      categroyMbCount: number,
+      onlineCount: number,
+      buddyUids: Array<string>;
+    }>;
+  }>;
+
 
   getBuddyListFromCache (reqType: BuddyListReqType): Promise<Array<
     {
@@ -21,7 +32,7 @@ export interface NodeIKernelBuddyService {
       categroyName: string, // 分类名
       categroyMbCount: number, // 不懂
       onlineCount: number, // 在线数目
-          buddyUids: Array<string>// Uids
+      buddyUids: Array<string>;// Uids
     }>>;
 
   addKernelBuddyListener (listener: NodeIKernelBuddyListener): number;
@@ -36,7 +47,7 @@ export interface NodeIKernelBuddyService {
 
   getBuddyRemark (uid: number): string;
 
-  setBuddyRemark(param: { uid: string, remark: string, signInfo?: unknown }): void;
+  setBuddyRemark (param: { uid: string, remark: string, signInfo?: unknown; }): void;
 
   getAvatarUrl (uid: number): string;
 
@@ -118,7 +129,7 @@ export interface NodeIKernelBuddyService {
 
   reportDoubtBuddyReqUnread (): void;
 
-  getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<GeneralCallResult & { arkMsg: string }>;
+  getBuddyRecommendContactArkJson (uid: string, phoneNumber: string): Promise<GeneralCallResult & { arkMsg: string; }>;
 
   isNull (): boolean;
 }

src/onebot/api/msg.ts

@@ -1434,8 +1434,7 @@ export class OneBotMsgApi {
         +await this.core.apis.UserApi.getUinByUidV2(groupInvite.invitorUid),
         'invite',
         '',
-        request_seq,
+        request_seq
-        +await this.core.apis.UserApi.getUinByUidV2(groupInvite.invitorUid)
       );
     } else if (SysMessage.contentHead.type === 528 && SysMessage.contentHead.subType === 39 && SysMessage.body?.msgContent) {
       return await this.obContext.apis.UserApi.parseLikeEvent(SysMessage.body?.msgContent);

src/onebot/event/request/OB11GroupRequest.ts

@@ -9,15 +9,13 @@ export class OB11GroupRequestEvent extends OB11BaseRequestEvent {
   comment: string;
   flag: string;
   sub_type: string;
-  invitor_id?: number;
 
-  constructor (core: NapCatCore, groupId: number, userId: number, sub_type: string, comment: string, flag: string, invitorId?: number) {
+  constructor (core: NapCatCore, groupId: number, userId: number, sub_type: string, comment: string, flag: string) {
     super(core);
     this.group_id = groupId;
     this.user_id = userId;
     this.sub_type = sub_type;
     this.comment = comment;
     this.flag = flag;
-    this.invitor_id = invitorId;
   }
 }

src/onebot/index.ts

@@ -466,15 +466,13 @@ export class NapCatOneBot11Adapter {
             notify.status === GroupNotifyMsgStatus.KUNHANDLE
           ) {
             this.context.logger.logDebug(`收到邀请我加群通知:${notify}`);
-            const inviterUin = +await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid);
             const groupInviteEvent = new OB11GroupRequestEvent(
               this.core,
               +notify.group.groupCode,
-              inviterUin,
+              +await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid),
               'invite',
               notify.postscript,
-              flag,
+              flag
-              inviterUin
             );
             this.networkManager
               .emitEvent(groupInviteEvent)
@@ -490,10 +488,9 @@ export class NapCatOneBot11Adapter {
               this.core,
               +notify.group.groupCode,
               +await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid),
-              'invite',
+              'add',
               notify.postscript,
-              flag,
+              flag
-              +await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid)
             );
             this.networkManager
               .emitEvent(groupInviteEvent)