summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@archlinux.org>2016-06-30 15:57:53 +0200
committerLukas Fleischer <lfleischer@archlinux.org>2016-06-30 22:45:26 +0200
commit60cdad28eebf45ac2822155cea27277e1f7de455 (patch)
treeca6d776153967c9b7008d3dffeab34d1f69c6853 /scripts
parentfbf3e5405781f0f7ded67e99ab83bebc0737499d (diff)
downloadaurweb-60cdad28eebf45ac2822155cea27277e1f7de455.tar.xz
Distinguish auto-accepted requests
Before commit 9746a65 (Port notification routines to Python, 2015-06-27), notification emails for automatically closed requests explicitly stated that the action was taken "automatically by the Arch User Repository package request system". When porting the notification routines to Python, this feature was overlooked and emails sent by the new script always reported that the requester triggered the acceptance or rejection of a request. This patch reimplements the old behavior such that notifications no longer look as if the requester had accepted the request himself. Reported-by: Johannes Löthberg <johannes@kyriasis.com> Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/notify.py19
1 files changed, 13 insertions, 6 deletions
diff --git a/scripts/notify.py b/scripts/notify.py
index 5e5f377..6ea25d1 100755
--- a/scripts/notify.py
+++ b/scripts/notify.py
@@ -41,7 +41,10 @@ def send_notification(to, subject, body, refs, headers={}):
wrapped = ''
for line in body.splitlines():
wrapped += textwrap.fill(line, break_long_words=False) + '\n'
- body = wrapped + '\n' + refs
+ if refs:
+ body = wrapped + '\n' + refs
+ else:
+ body = wrapped
for recipient in to:
msg = email.mime.text.MIMEText(body, 'plain', 'utf-8')
@@ -377,20 +380,24 @@ def request_open(cur, uid, reqid, reqtype, pkgbase_id, merge_into=None):
def request_close(cur, uid, reqid, reason):
- user = username_from_id(cur, uid)
to = [aur_request_ml]
cc = get_request_recipients(cur, reqid)
text = get_request_closure_comment(cur, reqid)
- user_uri = aur_location + '/account/' + user + '/'
-
subject = '[PRQ#%d] Request %s' % (int(reqid), reason.title())
- body = 'Request #%d has been %s by %s [1]' % (int(reqid), reason, user)
+ if int(uid):
+ user = username_from_id(cur, uid)
+ user_uri = aur_location + '/account/' + user + '/'
+ body = 'Request #%d has been %s by %s [1]' % (int(reqid), reason, user)
+ refs = '[1] ' + user_uri
+ else:
+ body = 'Request #%d has been %s automatically by the Arch User ' \
+ 'Repository package request system' % (int(reqid), reason)
+ refs = None
if text.strip() == '':
body += '.'
else:
body += ':\n\n' + text
- refs = '[1] ' + user_uri
thread_id = '<pkg-request-' + reqid + '@aur.archlinux.org>'
headers = headers_reply(thread_id)
headers.update(headers_cc(cc))