not send notification emails to inactive users (part 2)

Unfortunately fixing changes to `mail_issue.go` did not get included in go-gitea#19131. We also need to not send issue comment mails to deactivated users. Fix go-gitea#18950 Signed-off-by: Andrew Thornton <[email protected]>
zeripath · Mar 19, 2022 · 3552a76 · 3552a76
1 parent d160d8c
commit 3552a76
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go
@@ -125,6 +125,10 @@ func mailIssueCommentBatch(ctx *mailCommentContext, users []*user_model.User, vi
 
 	langMap := make(map[string][]*user_model.User)
 	for _, user := range users {
+		if !user.IsActive {
+			// Exclude deactivated users
+			continue
+		}
 		// At this point we exclude:
 		// user that don't have all mails enabled or users only get mail on mention and this is one ...
 		if !(user.EmailNotificationsPreference == user_model.EmailNotificationsEnabled ||