blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: add notifications for some notifications. (#1609)

Browse Source
This commit is contained in:
Gordon 2023-12-28 00:41:51 +08:00 committed by GitHub
parent cff90a3099
commit 53a3f475f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/msgprocessor/options.go
View File

@ -30,10 +30,9 @@ func NewOptions(opts ...OptionsOpt) Options {
options[constant.IsOfflinePush] = false options[constant.IsOfflinePush] = false
options[constant.IsUnreadCount] = false options[constant.IsUnreadCount] = false
options[constant.IsConversationUpdate] = false options[constant.IsConversationUpdate] = false
options[constant.IsSenderSync] = false options[constant.IsSenderSync] = true
options[constant.IsNotPrivate] = false options[constant.IsNotPrivate] = false
options[constant.IsSenderConversationUpdate] = false options[constant.IsSenderConversationUpdate] = false
options[constant.IsSenderNotificationPush] = false
options[constant.IsReactionFromCache] = false options[constant.IsReactionFromCache] = false
for _, opt := range opts { for _, opt := range opts {
opt(options) opt(options)
@ -114,12 +113,6 @@ func WithSenderConversationUpdate() OptionsOpt {
} }
} }
func WithSenderNotificationPush() OptionsOpt {
return func(options Options) {
options[constant.IsSenderNotificationPush] = true
}
}
func WithReactionFromCache() OptionsOpt { func WithReactionFromCache() OptionsOpt {
return func(options Options) { return func(options Options) {
options[constant.IsReactionFromCache] = true options[constant.IsReactionFromCache] = true
@ -174,10 +167,6 @@ func (o Options) IsSenderConversationUpdate() bool {
return o.Is(constant.IsSenderConversationUpdate) return o.Is(constant.IsSenderConversationUpdate)
} }
func (o Options) IsSenderNotificationPush() bool {
return o.Is(constant.IsSenderNotificationPush)
}
func (o Options) IsReactionFromCache() bool { func (o Options) IsReactionFromCache() bool {
return o.Is(constant.IsReactionFromCache) return o.Is(constant.IsReactionFromCache)
} }

9
pkg/rpcclient/msg.go
View File

@ -256,6 +256,7 @@ func (s *NotificationSender) NotificationWithSesstionType(ctx context.Context, s
optionsConfig.ReliabilityLevel = constant.UnreliableNotification optionsConfig.ReliabilityLevel = constant.UnreliableNotification
} }
options := config.GetOptionsByNotification(optionsConfig) options := config.GetOptionsByNotification(optionsConfig)
s.SetOptionsByContentType(ctx, options, contentType)
msg.Options = options msg.Options = options
offlineInfo.Title = title offlineInfo.Title = title
offlineInfo.Desc = desc offlineInfo.Desc = desc
@ -274,3 +275,11 @@ func (s *NotificationSender) NotificationWithSesstionType(ctx context.Context, s
func (s *NotificationSender) Notification(ctx context.Context, sendID, recvID string, contentType int32, m proto.Message, opts ...NotificationOptions) error { func (s *NotificationSender) Notification(ctx context.Context, sendID, recvID string, contentType int32, m proto.Message, opts ...NotificationOptions) error {
return s.NotificationWithSesstionType(ctx, sendID, recvID, contentType, s.sessionTypeConf[contentType], m, opts...) return s.NotificationWithSesstionType(ctx, sendID, recvID, contentType, s.sessionTypeConf[contentType], m, opts...)
} }
func (s *NotificationSender) SetOptionsByContentType(_ context.Context, options map[string]bool, contentType int32) {
switch contentType {
case constant.UserStatusChangeNotification:
options[constant.IsSenderSync] = false
default:
}
}