From 257353370b2d888181c2763552b21324dfa9e5cb Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jun 12 2015 14:26:51 +0000 Subject: Fix how is retrieved the list of emails to send the notification to --- diff --git a/pagure/lib/notify.py b/pagure/lib/notify.py index b3b8739..c6ac4d1 100644 --- a/pagure/lib/notify.py +++ b/pagure/lib/notify.py @@ -372,11 +372,7 @@ To reply, visit the link below or just reply to this email request.project.name, 'pull-request', request.id)) - mail_to = set([cmt.user.default_email for cmt in request.comments]) - mail_to.add(request.project.user.default_email) - for prouser in request.project.users: - if prouser.default_email: - mail_to.add(prouser.default_email) + mail_to = _get_emails_for_issue(request) send_email( text, @@ -408,11 +404,7 @@ Merged pull-request: request.project.name, 'pull-request', request.id)) - mail_to = set([cmt.user.default_email for cmt in request.comments]) - mail_to.add(request.project.user.default_email) - for prouser in request.project.users: - if prouser.default_email: - mail_to.add(prouser.default_email) + mail_to = _get_emails_for_issue(request) uid = time.mktime(datetime.datetime.now().timetuple()) send_email( @@ -446,11 +438,7 @@ Cancelled pull-request: request.project.name, 'pull-request', request.id)) - mail_to = set([cmt.user.default_email for cmt in request.comments]) - mail_to.add(request.project.user.default_email) - for prouser in request.project.users: - if prouser.default_email: - mail_to.add(prouser.default_email) + mail_to = _get_emails_for_issue(request) uid = time.mktime(datetime.datetime.now().timetuple()) send_email( @@ -482,14 +470,7 @@ To reply, visit the link below or just reply to this email comment.pull_request.project.name, 'pull-request', comment.pull_request.id)) - mail_to = set([ - cmt.user.default_email - for cmt in comment.pull_request.comments]) - mail_to.add(comment.pull_request.project.user.default_email) - for prouser in comment.pull_request.project.users: - if prouser.default_email: - mail_to.add(prouser.default_email) - + mail_to = _get_emails_for_issue(request) mail_to = _clean_emails(mail_to, user) send_email(