fix: 过滤掉已读

This commit is contained in:
手瓜一十雪
2025-05-09 18:51:00 +08:00
parent 607e367bb1
commit 98e347f010
3 changed files with 27 additions and 20 deletions

View File

@@ -3,43 +3,43 @@ import { BuddyCategoryType, FriendRequestNotify } from '@/core/types';
export type OnBuddyChangeParams = BuddyCategoryType[]; export type OnBuddyChangeParams = BuddyCategoryType[];
export class NodeIKernelBuddyListener { 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); console.log('onDelBatchBuddyInfos not implemented', ...arguments);
} }
@@ -66,12 +66,12 @@ export class NodeIKernelBuddyListener {
onDoubtBuddyReqUnreadNumChange(_num: number): void | Promise<void> { 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 {
} }
} }

View File

@@ -132,18 +132,26 @@ export enum BuddyReqType {
KMEINITIATORWAITPEERCONFIRM = 13 KMEINITIATORWAITPEERCONFIRM = 13
} }
// 其中 ? 代表新版本参数
export interface FriendRequest { export interface FriendRequest {
isBuddy?: boolean;
isInitiator?: boolean; isInitiator?: boolean;
isDecide: boolean; isDecide: boolean;
friendUid: string; friendUid: string;
reqType: BuddyReqType, reqType: BuddyReqType,
reqTime: string; // 时间戳 秒 reqTime: string; // 时间戳 秒
flag?: number; // 0
preGroupingId?: number; // 0
commFriendNum?: number; // 共同好友数
extWords: string; // 申请人填写的验证消息 extWords: string; // 申请人填写的验证消息
isUnread: boolean; isUnread: boolean;
isDoubt?: boolean; // 是否是可疑的好友请求
nameMore?: string;
friendNick: string; friendNick: string;
sourceId: number; sourceId: number;
groupCode: string groupCode: string;
isBuddy?: boolean;
isAgreed?: boolean;
relation?: number;
} }
export interface FriendRequestNotify { export interface FriendRequestNotify {

View File

@@ -334,7 +334,7 @@ export class NapCatOneBot11Adapter {
for (let i = 0; i < reqs.unreadNums; i++) { for (let i = 0; i < reqs.unreadNums; i++) {
const req = reqs.buddyReqs[i]; const req = reqs.buddyReqs[i];
if (!req) continue; if (!req) continue;
if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM)) { if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM) || !req.isUnread) {
continue; continue;
} }
try { try {
@@ -352,7 +352,6 @@ export class NapCatOneBot11Adapter {
} }
} }
}; };
this.context.session this.context.session
.getBuddyService() .getBuddyService()
.addKernelBuddyListener(proxiedListenerOf(buddyListener, this.context.logger)); .addKernelBuddyListener(proxiedListenerOf(buddyListener, this.context.logger));