opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-19 02:06:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevented double notification for reviewer who is also an assignee (#34282)

Browse Source 
* Prevented double notification for reviewer who is also an assignee

* Added basic doc

* CI

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Harshil Sharma
2025-10-31 16:27:37 +00:00
committed by GitHub
co-authored by Mattermost Build
parent d9ad77d4f8
commit 5f700e631f
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/channels/app/content_flagging.go
+2 -7
View File
@@ -726,13 +726,6 @@ func (a *App) KeepFlaggedPost(rctx request.CTX, actionRequest *model.FlagContent
}
a.invalidateCacheForChannelPosts(flaggedPost.ChannelId)
a.Srv().Go(func() {
_, postErr := a.postKeepPostReviewerMessage(rctx, flaggedPost.Id, reviewerId, actionRequest.Comment, groupId)
if postErr != nil {
rctx.Logger().Error("Failed to post keep post reviewer message after retaining flagged post", mlog.Err(postErr), mlog.String("post_id", flaggedPost.Id))
}
})
a.Srv().Go(func() {
a.sendKeepFlaggedPostNotification(rctx, flaggedPost, reviewerId, actionRequest.Comment, groupId)
})
@@ -1189,6 +1182,7 @@ func (a *App) sendFlagPostNotification(rctx request.CTX, flaggedPost *model.Post
return appErr
}
// sendFlaggedPostRemovalNotification handles the notifications when flagged post is removed for all audiences - reviewers, author, and reporter as per configuration
func (a *App) sendFlaggedPostRemovalNotification(rctx request.CTX, flaggedPost *model.Post, actorUserId, comment, contentFlaggingGroupId string) []*model.Post {
notificationSettings := a.Config().ContentFlaggingSettings.NotificationSettings
deletePostNotifications := notificationSettings.EventTargetMapping[model.EventContentRemoved]
@@ -1230,6 +1224,7 @@ func (a *App) sendFlaggedPostRemovalNotification(rctx request.CTX, flaggedPost *
return createdPosts
}
// sendKeepFlaggedPostNotification handles the notifications when flagged post is retained for all audiences - reviewers, author, and reporter as per configuration
func (a *App) sendKeepFlaggedPostNotification(rctx request.CTX, flaggedPost *model.Post, actorUserId, comment, contentFlaggingGroupId string) []*model.Post {
notificationSettings := a.Config().ContentFlaggingSettings.NotificationSettings
keepPostNotifications := notificationSettings.EventTargetMapping[model.EventContentDismissed]