diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 7488f68fb..2b0843093 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -341,7 +341,7 @@ type Notification struct { ////////////////////////user/////////////////////// UserInfoUpdated NotificationConf `yaml:"userInfoUpdated"` //////////////////////friend/////////////////////// - FriendApplication NotificationConf `yaml:"friendApplicationAdded"` + FriendApplicationAdded NotificationConf `yaml:"friendApplicationAdded"` FriendApplicationApproved NotificationConf `yaml:"friendApplicationApproved"` FriendApplicationRejected NotificationConf `yaml:"friendApplicationRejected"` FriendAdded NotificationConf `yaml:"friendAdded"` @@ -357,6 +357,7 @@ type Notification struct { func GetOptionsByNotification(cfg NotificationConf) utils.Options { opts := utils.NewOptions() + opts = utils.WithOptions(opts, utils.WithNotification(true)) if cfg.UnreadCount { opts = utils.WithOptions(opts, utils.WithUnreadCount()) } diff --git a/pkg/rpcclient/msg.go b/pkg/rpcclient/msg.go index 3160235a4..fd72d0d27 100644 --- a/pkg/rpcclient/msg.go +++ b/pkg/rpcclient/msg.go @@ -41,7 +41,7 @@ func newContentTypeConf() map[int32]config.NotificationConf { // user constant.UserInfoUpdatedNotification: config.Config.Notification.UserInfoUpdated, // friend - constant.FriendApplicationNotification: config.Config.Notification.FriendApplication, + constant.FriendApplicationNotification: config.Config.Notification.FriendApplicationAdded, constant.FriendApplicationApprovedNotification: config.Config.Notification.FriendApplicationApproved, constant.FriendApplicationRejectedNotification: config.Config.Notification.FriendApplicationRejected, constant.FriendAddedNotification: config.Config.Notification.FriendAdded,