From 5af41e83ce2ccae406b8359a73598f17086eaff4 Mon Sep 17 00:00:00 2001
From: Monet Lee <monet_lee@163.com>
Date: Wed, 30 Oct 2024 10:07:20 +0800
Subject: [PATCH] fix: solve err Notification when setGroupInfo. (#2806)

* fix: solve err Notification when setGroupInfo.

* build: update checkout version.

* fix: update notification contents.
---
 .../cleanup-after-milestone-prs-merged.yml    |  2 +-
 config/notification.yml                       | 23 +++----------------
 internal/rpc/group/group.go                   |  5 ++--
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/cleanup-after-milestone-prs-merged.yml b/.github/workflows/cleanup-after-milestone-prs-merged.yml
index ff4e8029da..8a3e381d60 100644
--- a/.github/workflows/cleanup-after-milestone-prs-merged.yml
+++ b/.github/workflows/cleanup-after-milestone-prs-merged.yml
@@ -11,7 +11,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4.2.0
 
     - name: Get the PR title and extract PR numbers
       id: extract_pr_numbers
diff --git a/config/notification.yml b/config/notification.yml
index 85ca91af18..ba5ca1c21a 100644
--- a/config/notification.yml
+++ b/config/notification.yml
@@ -1,20 +1,3 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Determines if a message should be sent. If set to false, it triggers a silent sync without a message. If true, it requires triggering a conversation.
-# For rpc notification, send twice: once as a message and once as a notification.
-# The options field 'isNotification' indicates if it's a notification.
 groupCreated:
   isSendMsg: true
 # Reliability level of the message sending.
@@ -309,9 +292,9 @@ userInfoUpdated:
   unreadCount: false
   offlinePush:
     enable: true
-    title: Remove a blocked user
-    desc: Remove a blocked user
-    ext: Remove a blocked user
+    title: userInfo updated
+    desc: userInfo updated
+    ext: userInfo updated
 
 userStatusChanged:
   isSendMsg: false
diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index c59d9d3f48..30ac19a76a 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -1026,7 +1026,7 @@ func (g *groupServer) SetGroupInfo(ctx context.Context, req *pbgroup.SetGroupInf
 	}
 	num := len(update)
 	if req.GroupInfoForSet.Notification != "" {
-		num--
+		num -= 3
 		func() {
 			conversation := &pbconversation.ConversationReq{
 				ConversationID:   msgprocessor.GetConversationIDBySessionType(constant.ReadGroupChatType, req.GroupInfoForSet.GroupID),
@@ -1133,8 +1133,9 @@ func (g *groupServer) SetGroupInfoEx(ctx context.Context, req *pbgroup.SetGroupI
 	}
 
 	num := len(updatedData)
+
 	if req.Notification != nil {
-		num--
+		num -= 3
 
 		if req.Notification.Value != "" {
 			func() {