From 98e347f010baf524d6d6f28445b30f39fab268e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Fri, 9 May 2025 18:51:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E6=8E=89=E5=B7=B2?=
 =?UTF-8?q?=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listeners/NodeIKernelBuddyListener.ts     | 32 +++++++++----------
 src/core/types/notify.ts                      | 12 +++++--
 src/onebot/index.ts                           |  3 +-
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/core/listeners/NodeIKernelBuddyListener.ts b/src/core/listeners/NodeIKernelBuddyListener.ts
index edf29044..c85883ad 100644
--- a/src/core/listeners/NodeIKernelBuddyListener.ts
+++ b/src/core/listeners/NodeIKernelBuddyListener.ts
@@ -3,43 +3,43 @@ import { BuddyCategoryType, FriendRequestNotify } from '@/core/types';
 export type OnBuddyChangeParams = BuddyCategoryType[];
 
 export class NodeIKernelBuddyListener {
-    onBuddyListChangedV2(arg: unknown): any {
+    onBuddyListChangedV2(_arg: unknown): any {
     }
 
-    onAddBuddyNeedVerify(arg: unknown): any {
+    onAddBuddyNeedVerify(_arg: unknown): any {
     }
 
-    onAddMeSettingChanged(arg: unknown): any {
+    onAddMeSettingChanged(_arg: unknown): any {
     }
 
-    onAvatarUrlUpdated(arg: unknown): any {
+    onAvatarUrlUpdated(_arg: unknown): any {
     }
 
-    onBlockChanged(arg: unknown): any {
+    onBlockChanged(_arg: unknown): any {
     }
 
-    onBuddyDetailInfoChange(arg: unknown): any {
+    onBuddyDetailInfoChange(_arg: unknown): any {
     }
 
-    onBuddyInfoChange(arg: unknown): any {
+    onBuddyInfoChange(_arg: unknown): any {
     }
 
-    onBuddyListChange(arg: OnBuddyChangeParams): any {
+    onBuddyListChange(_arg: OnBuddyChangeParams): any {
     }
 
-    onBuddyRemarkUpdated(arg: unknown): any {
+    onBuddyRemarkUpdated(_arg: unknown): any {
     }
 
-    onBuddyReqChange(arg: FriendRequestNotify): any {
+    onBuddyReqChange(_arg: FriendRequestNotify): any {
     }
 
-    onBuddyReqUnreadCntChange(arg: unknown): any {
+    onBuddyReqUnreadCntChange(_arg: unknown): any {
     }
 
-    onCheckBuddySettingResult(arg: unknown): any {
+    onCheckBuddySettingResult(_arg: unknown): any {
     }
 
-    onDelBatchBuddyInfos(arg: unknown): any {
+    onDelBatchBuddyInfos(_arg: unknown): any {
         console.log('onDelBatchBuddyInfos not implemented', ...arguments);
     }
 
@@ -66,12 +66,12 @@ export class NodeIKernelBuddyListener {
     onDoubtBuddyReqUnreadNumChange(_num: number): void | Promise<void> {
     }
 
-    onNickUpdated(arg: unknown): any {
+    onNickUpdated(_arg: unknown): any {
     }
 
-    onSmartInfos(arg: unknown): any {
+    onSmartInfos(_arg: unknown): any {
     }
 
-    onSpacePermissionInfos(arg: unknown): any {
+    onSpacePermissionInfos(_arg: unknown): any {
     }
 }
diff --git a/src/core/types/notify.ts b/src/core/types/notify.ts
index 52a1bafc..45fe4c9b 100644
--- a/src/core/types/notify.ts
+++ b/src/core/types/notify.ts
@@ -132,18 +132,26 @@ export enum BuddyReqType {
     KMEINITIATORWAITPEERCONFIRM = 13
 }
 
+// 其中 ? 代表新版本参数
 export interface FriendRequest {
-    isBuddy?: boolean;
     isInitiator?: boolean;
     isDecide: boolean;
     friendUid: string;
     reqType: BuddyReqType,
     reqTime: string;  // 时间戳 秒
+    flag?: number;  // 0
+    preGroupingId?: number;  // 0
+    commFriendNum?: number;  // 共同好友数
     extWords: string;  // 申请人填写的验证消息
     isUnread: boolean;
+    isDoubt?: boolean;  // 是否是可疑的好友请求
+    nameMore?: string;
     friendNick: string;
     sourceId: number;
-    groupCode: string
+    groupCode: string;
+    isBuddy?: boolean;
+    isAgreed?: boolean;
+    relation?: number;
 }
 
 export interface FriendRequestNotify {
diff --git a/src/onebot/index.ts b/src/onebot/index.ts
index 4fb0089c..baa4406a 100644
--- a/src/onebot/index.ts
+++ b/src/onebot/index.ts
@@ -334,7 +334,7 @@ export class NapCatOneBot11Adapter {
             for (let i = 0; i < reqs.unreadNums; i++) {
                 const req = reqs.buddyReqs[i];
                 if (!req) continue;
-                if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM)) {
+                if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM) || !req.isUnread) {
                     continue;
                 }
                 try {
@@ -352,7 +352,6 @@ export class NapCatOneBot11Adapter {
                 }
             }
         };
-
         this.context.session
             .getBuddyService()
             .addKernelBuddyListener(proxiedListenerOf(buddyListener, this.context.logger));