diff --git a/config/notification.yaml b/config/notification.yaml index 2cca59d6c..7ac8697e8 100644 --- a/config/notification.yaml +++ b/config/notification.yaml @@ -7,7 +7,7 @@ groupCreated: title: "create group title" # xx create the group desc: "create group desc" ext: "create group ext" - + # 不加消息contentType,content统一json 结构体使用pb的 @@ -41,7 +41,7 @@ memberQuit: title: "memberQuit title" desc: "memberQuit desc" ext: "memberQuit ext" - + groupApplicationAccepted: isSendMsg: false reliabilityLevel: 1 @@ -51,7 +51,7 @@ groupApplicationAccepted: title: "groupApplicationAccepted title" desc: "groupApplicationAccepted desc" ext: "groupApplicationAccepted ext" - + groupApplicationRejected: isSendMsg: false reliabilityLevel: 1 @@ -166,11 +166,33 @@ groupMemberInfoSet: desc: "groupMemberInfoSet desc" ext: "groupMemberInfoSet ext" +groupInfoSetAnnouncement: + isSendMsg: true + reliabilityLevel: 1 + unreadCount: false + offlinePush: + enable: false + title: "groupMemberInfoSet title" + desc: "groupMemberInfoSet desc" + ext: "groupMemberInfoSet ext" + + +groupInfoSetName: + isSendMsg: true + reliabilityLevel: 1 + unreadCount: false + offlinePush: + enable: false + title: "groupMemberInfoSet title" + desc: "groupMemberInfoSet desc" + ext: "groupMemberInfoSet ext" + + #############################friend################################# friendApplicationAdded: isSendMsg: false reliabilityLevel: 1 - unreadCount: false + unreadCount: false offlinePush: enable: false title: "Somebody applies to add you as a friend" @@ -180,7 +202,7 @@ friendApplicationAdded: friendApplicationApproved: isSendMsg: true reliabilityLevel: 1 - unreadCount: false + unreadCount: false offlinePush: enable: true title: "Someone applies to add your friend application" @@ -190,7 +212,7 @@ friendApplicationApproved: friendApplicationRejected: isSendMsg: false reliabilityLevel: 1 - unreadCount: false + unreadCount: false offlinePush: enable: true title: "Someone rejected your friend application" @@ -200,7 +222,7 @@ friendApplicationRejected: friendAdded: isSendMsg: false reliabilityLevel: 1 - unreadCount: false + unreadCount: false offlinePush: enable: true title: "We have become friends" @@ -210,7 +232,7 @@ friendAdded: friendDeleted: isSendMsg: false reliabilityLevel: 1 - unreadCount: false + unreadCount: false offlinePush: enable: true title: "deleted a friend" @@ -220,7 +242,7 @@ friendDeleted: friendRemarkSet: isSendMsg: false reliabilityLevel: 1 - unreadCount: false + unreadCount: false offlinePush: enable: true title: "Your friend's profile has been changed" @@ -230,7 +252,7 @@ friendRemarkSet: blackAdded: isSendMsg: false reliabilityLevel: 1 - unreadCount: false + unreadCount: false offlinePush: enable: true title: "blocked a user" @@ -240,7 +262,7 @@ blackAdded: blackDeleted: isSendMsg: false reliabilityLevel: 1 - unreadCount: false + unreadCount: false offlinePush: enable: true title: "Remove a blocked user" @@ -250,7 +272,7 @@ blackDeleted: friendInfoUpdated: isSendMsg: false reliabilityLevel: 1 - unreadCount: false + unreadCount: false offlinePush: enable: true title: "friend info updated" @@ -261,7 +283,7 @@ friendInfoUpdated: userInfoUpdated: isSendMsg: false reliabilityLevel: 1 - unreadCount: false + unreadCount: false offlinePush: enable: true title: "Remove a blocked user" @@ -272,7 +294,7 @@ userInfoUpdated: conversationChanged: isSendMsg: false reliabilityLevel: 1 - unreadCount: false + unreadCount: false offlinePush: enable: true title: "conversation changed" @@ -282,7 +304,7 @@ conversationChanged: conversationSetPrivate: isSendMsg: true reliabilityLevel: 1 - unreadCount: false + unreadCount: false offlinePush: enable: true title: "burn after reading" diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index c6b565024..1592d8edf 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -332,6 +332,8 @@ type Notification struct { GroupMemberInfoSet NotificationConf `yaml:"groupMemberInfoSet"` GroupMemberSetToAdmin NotificationConf `yaml:"groupMemberSetToAdmin"` GroupMemberSetToOrdinary NotificationConf `yaml:"groupMemberSetToOrdinaryUser"` + GroupInfoSetAnnouncement NotificationConf `yaml:"groupInfoSetAnnouncement"` + GroupInfoSetName NotificationConf `yaml:"groupInfoSetName"` ////////////////////////user/////////////////////// UserInfoUpdated NotificationConf `yaml:"userInfoUpdated"` //////////////////////friend/////////////////////// diff --git a/pkg/rpcclient/msg.go b/pkg/rpcclient/msg.go index e94b0a0d5..3bed1b281 100644 --- a/pkg/rpcclient/msg.go +++ b/pkg/rpcclient/msg.go @@ -37,6 +37,8 @@ func newContentTypeConf() map[int32]config.NotificationConf { constant.GroupMemberInfoSetNotification: config.Config.Notification.GroupMemberInfoSet, constant.GroupMemberSetToAdminNotification: config.Config.Notification.GroupMemberSetToAdmin, constant.GroupMemberSetToOrdinaryUserNotification: config.Config.Notification.GroupMemberSetToOrdinary, + constant.GroupInfoSetAnnouncementNotification: config.Config.Notification.GroupInfoSetAnnouncement, + constant.GroupInfoSetNameNotification: config.Config.Notification.GroupInfoSetName, // user constant.UserInfoUpdatedNotification: config.Config.Notification.UserInfoUpdated, // friend @@ -79,6 +81,8 @@ func newSessionTypeConf() map[int32]int32 { constant.GroupMemberInfoSetNotification: constant.SuperGroupChatType, constant.GroupMemberSetToAdminNotification: constant.SuperGroupChatType, constant.GroupMemberSetToOrdinaryUserNotification: constant.SuperGroupChatType, + constant.GroupInfoSetAnnouncementNotification: constant.SuperGroupChatType, + constant.GroupInfoSetNameNotification: constant.SuperGroupChatType, // user constant.UserInfoUpdatedNotification: constant.SingleChatType, // friend