From 47e31f629b7ff09a9bea37d73d97a89c7ac62911 Mon Sep 17 00:00:00 2001
From: a3d21 <a3d21@outlook.com>
Date: Fri, 26 Jan 2024 10:22:17 +0800
Subject: [PATCH] fix duplicated offline push

---
 internal/push/push_to_client.go | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/internal/push/push_to_client.go b/internal/push/push_to_client.go
index 72deb720d..caa39e618 100644
--- a/internal/push/push_to_client.go
+++ b/internal/push/push_to_client.go
@@ -118,18 +118,25 @@ func (p *Pusher) Push2User(ctx context.Context, userIDs []string, msg *sdkws.Msg
 		return nil
 	}
 
-	for _, v := range wsResults {
-		if !v.OnlinePush && msg.SendID == v.UserID {
-			if err = callbackOfflinePush(ctx, userIDs, msg, &[]string{}); err != nil {
-				return err
-			}
+	if len(wsResults) == 0 {
+		return nil
+	}
+	onlinePushSuccUserIDSet := utils.SliceSet(utils.Filter(wsResults, func(e *msggateway.SingleMsgToUserResults) (string, bool) {
+		return e.UserID, e.OnlinePush && e.UserID != ""
+	}))
+	offlinePushUserIDList := utils.Filter(wsResults, func(e *msggateway.SingleMsgToUserResults) (string, bool) {
+		_, exist := onlinePushSuccUserIDSet[e.UserID]
+		return e.UserID, !exist && e.UserID != "" && e.UserID != msg.SendID
+	})
 
-			err = p.offlinePushMsg(ctx, msg.SendID, msg, []string{v.UserID})
-			if err != nil {
-				return err
-			}
+	if len(offlinePushUserIDList) > 0 {
+		if err = callbackOfflinePush(ctx, offlinePushUserIDList, msg, &[]string{}); err != nil {
+			return err
+		}
+		err = p.offlinePushMsg(ctx, msg.SendID, msg, offlinePushUserIDList)
+		if err != nil {
+			return err
 		}
-
 	}
 	return nil
 }