arno/isso
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set subject for notification about new comment, subject should not be empty (#589)

Browse Source
This commit is contained in:
Michiel Scholten 2019-11-25 10:06:42 +01:00 committed by Jelmer Vernooij
parent 95b05bd3fe
commit 472c9ed3de
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
isso/ext/notifications.py
View File

@ -149,7 +149,10 @@ class SMTP(object):
def notify_new(self, thread, comment): def notify_new(self, thread, comment):
if self.admin_notify: if self.admin_notify:
body = self.format(thread, comment, None, admin=True) body = self.format(thread, comment, None, admin=True)
self.sendmail(thread["title"], body, thread, comment) subject = "New comment posted"
if thread['title']:
subject = "%s on %s" % (subject, thread["title"])
self.sendmail(subject, body, thread, comment)
if comment["mode"] == 1: if comment["mode"] == 1:
self.notify_users(thread, comment) self.notify_users(thread, comment)
@ -175,6 +178,9 @@ class SMTP(object):
def sendmail(self, subject, body, thread, comment, to=None): def sendmail(self, subject, body, thread, comment, to=None):
to = to or self.conf.get("to") to = to or self.conf.get("to")
if not subject:
# Fallback, just in case as an empty subject does not work
subject = 'isso notification'
if uwsgi: if uwsgi:
uwsgi.spool({b"subject": subject.encode("utf-8"), uwsgi.spool({b"subject": subject.encode("utf-8"),
b"body": body.encode("utf-8"), b"body": body.encode("utf-8"),