From a6f8580e61124daa62e1db724fe1d49664179df6 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Wed, 2 Dec 2020 23:25:57 -0600 Subject: [PATCH 1/2] Initial pass Signed-off-by: jolheiser --- services/mailer/mail_issue.go | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go index 01c198984b5d7..ee4705fa2e710 100644 --- a/services/mailer/mail_issue.go +++ b/services/mailer/mail_issue.go @@ -122,7 +122,21 @@ func mailIssueCommentBatch(ctx *mailCommentContext, ids []int64, visited map[int if err != nil { return err } - // TODO: Check issue visibility for each user + + // Make sure all recipients can still see the issue + idx := 0 + for _, r := range recipients { + if ctx.Issue.Repo.CheckUnitUser(r, models.UnitTypeIssues) { + recipients[idx] = r + idx++ + } + } + // Clean up potential memory leak + for j := idx; j < len(recipients); j++ { + recipients[j] = nil + } + recipients = recipients[:idx] + // TODO: Separate recipients by language for i18n mail templates tos := make([]string, len(recipients)) for i := range recipients { From 4ad308948d8a8e6cdd8dd4c74bc710a79b0ffceb Mon Sep 17 00:00:00 2001 From: jolheiser Date: Thu, 3 Dec 2020 10:47:35 -0600 Subject: [PATCH 2/2] Remove over-op Signed-off-by: jolheiser --- services/mailer/mail_issue.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go index ee4705fa2e710..30b54eb6cb393 100644 --- a/services/mailer/mail_issue.go +++ b/services/mailer/mail_issue.go @@ -131,10 +131,6 @@ func mailIssueCommentBatch(ctx *mailCommentContext, ids []int64, visited map[int idx++ } } - // Clean up potential memory leak - for j := idx; j < len(recipients); j++ { - recipients[j] = nil - } recipients = recipients[:idx] // TODO: Separate recipients by language for i18n mail templates