From 545125884e8b1dbfe4de71a34ad1a5a5663bef7c Mon Sep 17 00:00:00 2001
From: icey-yu <119291641+icey-yu@users.noreply.github.com>
Date: Mon, 16 Jun 2025 10:46:07 +0800
Subject: [PATCH] fix: import friends send notification (#3420)

---
 internal/rpc/relation/friend.go       |  4 ++--
 internal/rpc/relation/notification.go | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/internal/rpc/relation/friend.go b/internal/rpc/relation/friend.go
index d05cf7d77..43909c8e3 100644
--- a/internal/rpc/relation/friend.go
+++ b/internal/rpc/relation/friend.go
@@ -192,7 +192,7 @@ func (s *friendServer) ImportFriends(ctx context.Context, req *relation.ImportFr
 			FromUserID:   req.OwnerUserID,
 			ToUserID:     userID,
 			HandleResult: constant.FriendResponseAgree,
-		})
+		}, false)
 	}
 
 	s.webhookAfterImportFriends(ctx, &s.config.WebhooksConfig.AfterImportFriends, req)
@@ -221,7 +221,7 @@ func (s *friendServer) RespondFriendApply(ctx context.Context, req *relation.Res
 			return nil, err
 		}
 		s.webhookAfterAddFriendAgree(ctx, &s.config.WebhooksConfig.AfterAddFriendAgree, req)
-		s.notificationSender.FriendApplicationAgreedNotification(ctx, req)
+		s.notificationSender.FriendApplicationAgreedNotification(ctx, req, true)
 		return resp, nil
 	}
 	if req.HandleResult == constant.FriendResponseRefuse {
diff --git a/internal/rpc/relation/notification.go b/internal/rpc/relation/notification.go
index d6a03003e..4ee45e197 100644
--- a/internal/rpc/relation/notification.go
+++ b/internal/rpc/relation/notification.go
@@ -171,11 +171,17 @@ func (f *FriendNotificationSender) FriendApplicationAddNotification(ctx context.
 	f.Notification(ctx, req.FromUserID, req.ToUserID, constant.FriendApplicationNotification, &tips)
 }
 
-func (f *FriendNotificationSender) FriendApplicationAgreedNotification(ctx context.Context, req *relation.RespondFriendApplyReq) {
-	request, err := f.getFriendRequests(ctx, req.FromUserID, req.ToUserID)
-	if err != nil {
-		log.ZError(ctx, "FriendApplicationAgreedNotification get friend request", err, "fromUserID", req.FromUserID, "toUserID", req.ToUserID)
-		return
+func (f *FriendNotificationSender) FriendApplicationAgreedNotification(ctx context.Context, req *relation.RespondFriendApplyReq, checkReq bool) {
+	var (
+		request *sdkws.FriendRequest
+		err     error
+	)
+	if checkReq {
+		request, err = f.getFriendRequests(ctx, req.FromUserID, req.ToUserID)
+		if err != nil {
+			log.ZError(ctx, "FriendApplicationAgreedNotification get friend request", err, "fromUserID", req.FromUserID, "toUserID", req.ToUserID)
+			return
+		}
 	}
 	tips := sdkws.FriendApplicationApprovedTips{
 		FromToUserID: &sdkws.FromToUserID{