Mercurial > kallithea
changeset 8559:fcff67b0de83
notifications: explicitly add author of pull request in invitation mail
When an author of a pull request does not get feedback from any of the
reviewers, he is left wondering whether they got the invitation mail at all.
By explicitly sending the invitation also to the author, he can at least know
if e-mail works at the server side and how reviewers see it.
The mail can also be forwarded as a 'reminder'.
| author | Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> |
|---|---|
| date | Sun, 22 Mar 2020 00:14:06 +0100 |
| parents | f6ee6d26b9bd |
| children | f79c40759d6f |
| files | kallithea/model/notification.py kallithea/tests/models/test_dump_html_mails.ref.html |
| diffstat | 2 files changed, 393 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/model/notification.py Sun May 10 21:31:56 2020 +0200 +++ b/kallithea/model/notification.py Sun Mar 22 00:14:06 2020 +0100 @@ -126,12 +126,18 @@ email_html_body = EmailNotificationModel() \ .get_email_tmpl(type_, 'html', **html_kwargs) - # don't send email to person who created this comment - rec_objs = set(recipients_objs).difference(set([created_by_obj])) + # don't send email to the person who caused the notification, except for + # notifications about new pull requests where the author is explicitly + # added. + rec_mails = set(obj.email for obj in recipients_objs) + if type_ == NotificationModel.TYPE_PULL_REQUEST: + rec_mails.add(created_by_obj.email) + else: + rec_mails.discard(created_by_obj.email) - # send email with notification to all other participants - for rec in rec_objs: - tasks.send_email([rec.email], email_subject, email_txt_body, + # send email with notification to participants + for rec_mail in sorted(rec_mails): + tasks.send_email([rec_mail], email_subject, email_txt_body, email_html_body, headers, from_name=created_by_obj.full_name_or_username)
--- a/kallithea/tests/models/test_dump_html_mails.ref.html Sun May 10 21:31:56 2020 +0200 +++ b/kallithea/tests/models/test_dump_html_mails.ref.html Sun Mar 22 00:14:06 2020 +0100 @@ -882,6 +882,197 @@ <h1>pull_request, is_mention=False</h1> <pre> From: u1 u1 <name@example.com> +To: u1@example.com +Subject: [Review] repo/name PR #7 "The Title" from devbranch by u2 +</pre> +<hr/> +<pre>http://pr.org/7 + +Added as Reviewer of Pull Request #7 "The Title" by Requesting User (root) + + +Pull request #7 "The Title" by u2 u3 (u2) +from https://dev.org/repo branch devbranch +to http://mainline.com/repo branch trunk + + +Description: + +This PR is 'awesome' because it does <stuff> + - please approve indented! + + +Changesets: + +Introduce one and two +Make one plus two equal tree + + +View Pull Request: http://pr.org/7 +</pre> +<hr/> +<!--!doctype html--> +<!--html lang="en"--> +<!--head--> + <!--title--><!--/title--> + <!--meta name="viewport" content="width=device-width"--> + <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"--> +<!--/head--> +<!--body--> +<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020"> + <tr> + <td width="30px" style="width:30px"></td> + <td> + <table width="100%" cellpadding="0" cellspacing="0" border="0" + style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd"> + <tr><td width="30px" style="width:30px"></td><td></td><td width="30px" style="width:30px"></td></tr> + <tr> + <td colspan="3"> +<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0" + style="border-bottom:1px solid #ddd"> + <tr> + <td height="20px" style="height:20px" colspan="3"></td> + </tr> + <tr> + <td width="30px" style="width:30px"></td> + <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px"> + <a style="text-decoration:none;font-weight:600;color:#395fa0" href="http://pr.org/7" + target="_blank">Added as Reviewer of Pull Request #7 "The Title" by Requesting User (root)</a> + </td> + <td width="30px" style="width:30px"></td> + </tr> + <tr> + <td height="20px" style="height:20px" colspan="3"></td> + </tr> +</table> + </td> + </tr> + <tr> + <td height="30px" style="height:30px" colspan="3"></td> + </tr> + <tr> + <td></td> + <td> +<table cellpadding="0" cellspacing="0" border="0" width="100%"> + <tr> + <td> + <div> + Pull request + <a style="color:#395fa0;text-decoration:none" + href="http://pr.org/7">#7 "The Title"</a> + by + <span style="border:#ddd 1px solid;background:#f9f9f9">u2 u3 (u2)</span>. + </div> + <div> + from + <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9" + href="https://dev.org/repo">https://dev.org/repo</a> + branch + <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span> + <br/> + to + <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9" + href="http://mainline.com/repo">http://mainline.com/repo</a> + branch + <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span> + </div> + </td> + </tr> + <tr><td height="10px" style="height:10px"></td></tr> + <tr> + <td> + <div> + Description: + </div> + </td> + </tr> + <tr><td height="10px" style="height:10px"></td></tr> + <tr> + <td> + <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px"> + <tr> + <td height="10px" style="height:10px" colspan="3"></td> + </tr> + <tr> + <td width="20px" style="width:20px"></td> + <td> + <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This PR is 'awesome' because it does <stuff><br/> - please approve indented!</div></div> + </td> + <td width="20px" style="width:20px"></td> + </tr> + <tr> + <td height="10px" style="height:10px" colspan="3"></td> + </tr> + </table> + </td> + </tr> + <tr><td height="15px" style="height:15px"></td></tr> + <tr> + <td> + <div>Changesets:</div> + </td> + </tr> + <tr><td height="10px" style="height:10px"></td></tr> + + <tr> + <td style="font-family:Helvetica,Arial,sans-serif"> + <ul style="color:#395fa0;padding-left:15px;margin:0"> + <li style="mso-special-format:bullet"> + <a style="color:#395fa0;text-decoration:none" + href="http://changeset_home/?repo_name=repo_org&revision=123abc123abc123abc123abc123abc123abc123abc"> + Introduce one and two + </a> + </li> + <li style="mso-special-format:bullet"> + <a style="color:#395fa0;text-decoration:none" + href="http://changeset_home/?repo_name=repo_org&revision=567fed567fed567fed567fed567fed567fed567fed"> + Make one plus two equal tree + </a> + </li> + </ul> + </td> + </tr> + <tr> + <td> +<center> + <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto"> + <tr> + <td height="25px" style="height:25px"></td> + </tr> + <tr> + <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px"> + <a href="http://pr.org/7" style="text-decoration:none;display:block" target="_blank"> + <center> + <font size="3"> + <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Pull Request</span> + </font> + </center> + </a> + </td> + </tr> + </table> +</center> + </td> + </tr> +</table> + </td> + <td></td> + </tr> + <tr> + <td height="30px" style="height:30px" colspan="3"></td> + </tr> + </table> + </td> + <td width="30px" style="width:30px"></td> + </tr> +</table> +<!--/body--> +<!--/html--> +<hr/> +<hr/> +<h1>pull_request, is_mention=False</h1> +<pre> +From: u1 u1 <name@example.com> To: u2@example.com Subject: [Review] repo/name PR #7 "The Title" from devbranch by u2 </pre> @@ -1073,6 +1264,197 @@ <h1>pull_request, is_mention=True</h1> <pre> From: u1 u1 <name@example.com> +To: u1@example.com +Subject: [Review] repo/name PR #7 "The Title" from devbranch by u2 +</pre> +<hr/> +<pre>http://pr.org/7 + +Mention on Pull Request #7 "The Title" by Requesting User (root) + + +Pull request #7 "The Title" by u2 u3 (u2) +from https://dev.org/repo branch devbranch +to http://mainline.com/repo branch trunk + + +Description: + +This PR is 'awesome' because it does <stuff> + - please approve indented! + + +Changesets: + +Introduce one and two +Make one plus two equal tree + + +View Pull Request: http://pr.org/7 +</pre> +<hr/> +<!--!doctype html--> +<!--html lang="en"--> +<!--head--> + <!--title--><!--/title--> + <!--meta name="viewport" content="width=device-width"--> + <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"--> +<!--/head--> +<!--body--> +<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020"> + <tr> + <td width="30px" style="width:30px"></td> + <td> + <table width="100%" cellpadding="0" cellspacing="0" border="0" + style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd"> + <tr><td width="30px" style="width:30px"></td><td></td><td width="30px" style="width:30px"></td></tr> + <tr> + <td colspan="3"> +<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0" + style="border-bottom:1px solid #ddd"> + <tr> + <td height="20px" style="height:20px" colspan="3"></td> + </tr> + <tr> + <td width="30px" style="width:30px"></td> + <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px"> + <a style="text-decoration:none;font-weight:600;color:#395fa0" href="http://pr.org/7" + target="_blank">Mention on Pull Request #7 "The Title" by Requesting User (root)</a> + </td> + <td width="30px" style="width:30px"></td> + </tr> + <tr> + <td height="20px" style="height:20px" colspan="3"></td> + </tr> +</table> + </td> + </tr> + <tr> + <td height="30px" style="height:30px" colspan="3"></td> + </tr> + <tr> + <td></td> + <td> +<table cellpadding="0" cellspacing="0" border="0" width="100%"> + <tr> + <td> + <div> + Pull request + <a style="color:#395fa0;text-decoration:none" + href="http://pr.org/7">#7 "The Title"</a> + by + <span style="border:#ddd 1px solid;background:#f9f9f9">u2 u3 (u2)</span>. + </div> + <div> + from + <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9" + href="https://dev.org/repo">https://dev.org/repo</a> + branch + <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span> + <br/> + to + <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9" + href="http://mainline.com/repo">http://mainline.com/repo</a> + branch + <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span> + </div> + </td> + </tr> + <tr><td height="10px" style="height:10px"></td></tr> + <tr> + <td> + <div> + Description: + </div> + </td> + </tr> + <tr><td height="10px" style="height:10px"></td></tr> + <tr> + <td> + <table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px"> + <tr> + <td height="10px" style="height:10px" colspan="3"></td> + </tr> + <tr> + <td width="20px" style="width:20px"></td> + <td> + <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This PR is 'awesome' because it does <stuff><br/> - please approve indented!</div></div> + </td> + <td width="20px" style="width:20px"></td> + </tr> + <tr> + <td height="10px" style="height:10px" colspan="3"></td> + </tr> + </table> + </td> + </tr> + <tr><td height="15px" style="height:15px"></td></tr> + <tr> + <td> + <div>Changesets:</div> + </td> + </tr> + <tr><td height="10px" style="height:10px"></td></tr> + + <tr> + <td style="font-family:Helvetica,Arial,sans-serif"> + <ul style="color:#395fa0;padding-left:15px;margin:0"> + <li style="mso-special-format:bullet"> + <a style="color:#395fa0;text-decoration:none" + href="http://changeset_home/?repo_name=repo_org&revision=123abc123abc123abc123abc123abc123abc123abc"> + Introduce one and two + </a> + </li> + <li style="mso-special-format:bullet"> + <a style="color:#395fa0;text-decoration:none" + href="http://changeset_home/?repo_name=repo_org&revision=567fed567fed567fed567fed567fed567fed567fed"> + Make one plus two equal tree + </a> + </li> + </ul> + </td> + </tr> + <tr> + <td> +<center> + <table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto"> + <tr> + <td height="25px" style="height:25px"></td> + </tr> + <tr> + <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px"> + <a href="http://pr.org/7" style="text-decoration:none;display:block" target="_blank"> + <center> + <font size="3"> + <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Pull Request</span> + </font> + </center> + </a> + </td> + </tr> + </table> +</center> + </td> + </tr> +</table> + </td> + <td></td> + </tr> + <tr> + <td height="30px" style="height:30px" colspan="3"></td> + </tr> + </table> + </td> + <td width="30px" style="width:30px"></td> + </tr> +</table> +<!--/body--> +<!--/html--> +<hr/> +<hr/> +<h1>pull_request, is_mention=True</h1> +<pre> +From: u1 u1 <name@example.com> To: u2@example.com Subject: [Review] repo/name PR #7 "The Title" from devbranch by u2 </pre>