kallithea Changeset - c25392980f91

Changeset - c25392980f91

Parent rev.

Child rev.

[Not reviewed]

stable

0 1 0

Thomas De Schampheleire - 9 years ago 2016-10-11 17:45:40
thomas.de.schampheleire@gmail.com

Grafted from: 84099c5e0920

email: add X-Kallithea-Notification-Type header

To simplify email filtering, add a header indicating the type of email being
sent. The 'type_' value corresponds to one of the types defined in class
Notification in kallithea/model/db.py, e.g. 'cs_comment', 'pull_request',
'pull_request_comment', ...

1 file changed with 3 insertions and 2 deletions:

kallithea/model/notification.py

0 comments (0 inline, 0 general)

kallithea/model/notification.py

➞

Show inline comments

@@ @@ -93,51 +93,52 @@ class NotificationModel(BaseModel): @@
             recipients_objs = set(recipients_objs)
             log.debug('sending notifications %s to %s',
                 type_, recipients_objs
+            )
         elif recipients is None:
             # empty recipients means to all admins
             recipients_objs = User.query().filter(User.admin == True).all()
             log.debug('sending notifications %s to admins: %s',
                 type_, recipients_objs
+            )
         #else: silently skip notification mails?
         # TODO: inform user who are notified
         notif = Notification.create(
             created_by=created_by_obj, subject=subject,
             body=body, recipients=recipients_objs, type_=type_
+        )
         if not with_email:
             return notif
         #don't send email to person who created this comment
         rec_objs = set(recipients_objs).difference(set([created_by_obj]))
         headers = None
         headers = {}
         headers['X-Kallithea-Notification-Type'] = type_
         if 'threading' in email_kwargs:
-            headers = {'References': ' '.join('<%s>' % x for x in email_kwargs['threading'])}
+            headers['References'] = ' '.join('<%s>' % x for x in email_kwargs['threading'])
         # send email with notification to all other participants
         for rec in rec_objs:
             ## this is passed into template
             html_kwargs = {
                       'subject': subject,
                       'body': h.rst_w_mentions(body),
                       'when': h.fmt_date(notif.created_on),
                       'user': notif.created_by_user.username,
+                      }
             txt_kwargs = {
                       'subject': subject,
                       'body': body,
                       'when': h.fmt_date(notif.created_on),
                       'user': notif.created_by_user.username,
+                      }
             html_kwargs.update(email_kwargs)
             txt_kwargs.update(email_kwargs)
             email_subject = EmailNotificationModel()\
                                 .get_email_description(type_, **txt_kwargs)
             email_txt_body = EmailNotificationModel()\
                                 .get_email_tmpl(type_, 'txt', **txt_kwargs)

0 comments (0 inline, 0 general)