From de451d4cea1d961464318b7b2cd0ee657bd8b37d Mon Sep 17 00:00:00 2001
From: Gordon <46924906+FGadvancer@users.noreply.github.com>
Date: Mon, 25 Dec 2023 16:30:18 +0800
Subject: [PATCH] fix: online notifications do not push to herself. (#1534)

* fix: online notifications do not push to herself.

* fix: online notifications do not push to herself.

* fix: online notifications do not push to herself.
---
 internal/push/push_handler.go    | 11 ++++++-----
 internal/push/push_rpc_server.go |  3 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/internal/push/push_handler.go b/internal/push/push_handler.go
index a1a9ff08e..c91206ecc 100644
--- a/internal/push/push_handler.go
+++ b/internal/push/push_handler.go
@@ -67,13 +67,14 @@ func (c *ConsumerHandler) handleMs2PsChat(ctx context.Context, msg []byte) {
 	case constant.SuperGroupChatType:
 		err = c.pusher.Push2SuperGroup(ctx, pbData.MsgData.GroupID, pbData.MsgData)
 	default:
-		var pushUserIDs []string
-		if pbData.MsgData.SendID != pbData.MsgData.RecvID {
-			pushUserIDs = []string{pbData.MsgData.SendID, pbData.MsgData.RecvID}
+		var pushUserIDList []string
+		isSenderSync := utils.GetSwitchFromOptions(pbData.MsgData.Options, constant.IsSenderSync)
+		if !isSenderSync || pbData.MsgData.SendID == pbData.MsgData.RecvID {
+			pushUserIDList = append(pushUserIDList, pbData.MsgData.RecvID)
 		} else {
-			pushUserIDs = []string{pbData.MsgData.SendID}
+			pushUserIDList = append(pushUserIDList, pbData.MsgData.RecvID, pbData.MsgData.SendID)
 		}
-		err = c.pusher.Push2User(ctx, pushUserIDs, pbData.MsgData)
+		err = c.pusher.Push2User(ctx, pushUserIDList, pbData.MsgData)
 	}
 	if err != nil {
 		if err == errNoOfflinePusher {
diff --git a/internal/push/push_rpc_server.go b/internal/push/push_rpc_server.go
index 188ddc0e1..9e66f8f73 100644
--- a/internal/push/push_rpc_server.go
+++ b/internal/push/push_rpc_server.go
@@ -16,9 +16,8 @@ package push
 
 import (
 	"context"
-	"sync"
-
 	"github.com/OpenIMSDK/tools/utils"
+	"sync"
 
 	"google.golang.org/grpc"