kallithea Changeset - 0529498575ce

Changeset - 0529498575ce

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Mads Kiilerich - 11 years ago 2014-07-18 19:22:01
madski@unity3d.com

notifications: insert 'References' mail headers to help MUA threading

gmail is however fubar.

5 files changed with 28 insertions and 13 deletions:

kallithea/lib/celerylib/tasks.py

kallithea/lib/rcmail/smtp_mailer.py

kallithea/model/comment.py

kallithea/model/notification.py

kallithea/model/pull_request.py

0 comments (0 inline, 0 general)

kallithea/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -254,13 +254,13 @@ def get_commits_stats(repo_name, ts_min_ @@
         log.info('LockHeld')
         return 'Task with key %s already running' % lockkey
 @task(ignore_result=True)
 @dbsession
 def send_email(recipients, subject, body='', html_body=''):
+def send_email(recipients, subject, body='', html_body='', headers=None):
     """
     Sends an email with defined parameters from the .ini files.
     :param recipients: list of recipients, if this is None, the defined email
         address from field 'email_to' and all admins is used instead
     :param subject: subject of the mail
@@ @@ -301,13 +301,13 @@ def send_email(recipients, subject, body @@
         log.warning("html:\n%s", html_body)
         return False
     try:
         m = SmtpMailer(mail_from, user, passwd, mail_server, smtp_auth,
                        mail_port, ssl, tls, debug=debug)
         m.send(recipients, subject, body, html_body)
+        m.send(recipients, subject, body, html_body, headers=headers)
     except:
         log.error('Mail sending failed')
         log.error(traceback.format_exc())
         return False
     return True

kallithea/lib/rcmail/smtp_mailer.py

➞

Show inline comments

@@ @@ -58,19 +58,19 @@ class SmtpMailer(object): @@
         self.ssl = ssl
         self.tls = tls
         self.debug = debug
         self.auth = smtp_auth
     def send(self, recipients=[], subject='', body='', html='',
              attachment_files=None):
+             attachment_files=None, headers=None):
         if isinstance(recipients, basestring):
             recipients = [recipients]
         headers = {
             'Date': formatdate(time.time())
+        }
         if headers is None:
             headers = {}
         headers.setdefault('Date', formatdate(time.time()))
         msg = Message(subject, recipients, body, html, self.mail_from,
                       recipients_separator=", ", extra_headers=headers)
         raw_msg = msg.to_message()
         if self.ssl:
             smtp_serv = smtplib.SMTP_SSL(self.mail_server, self.mail_port,

kallithea/model/comment.py

➞

Show inline comments

@@ @@ -79,22 +79,26 @@ class ChangesetCommentsModel(BaseModel): @@
         #changeset
         if revision:
             notification_type = Notification.TYPE_CHANGESET_COMMENT
             cs = repo.scm_instance.get_changeset(revision)
             desc = "%s" % (cs.short_id)
             _url = h.url('changeset_home',
             revision_url = h.url('changeset_home',
                 repo_name=repo.repo_name,
                 revision=revision,
                 qualified=True,)
             comment_url = h.url('changeset_home',
                 repo_name=repo.repo_name,
                 revision=revision,
                 anchor='comment-%s' % comment.comment_id,
                 qualified=True,
+            )
             subj = safe_unicode(
                 h.link_to('Re changeset: %(desc)s %(line)s' % \
                           {'desc': desc, 'line': line},
-                          _url)
+                          comment_url)
+            )
             # get the current participants of this changeset
             recipients = ChangesetComment.get_users(revision=revision)
             # add changeset author if it's in kallithea system
             cs_author = User.get_from_cs_author(cs.author)
             if not cs_author:
@@ @@ -103,37 +107,42 @@ class ChangesetCommentsModel(BaseModel): @@
             recipients += [cs_author]
             email_kwargs = {
                 'status_change': status_change,
                 'cs_comment_user': h.person(user),
                 'cs_target_repo': h.url('summary_home', repo_name=repo.repo_name,
                                         qualified=True),
-                'cs_comment_url': _url,
+                'cs_comment_url': comment_url,
                 'raw_id': revision,
                 'message': cs.message,
                 'repo_name': repo.repo_name,
                 'short_id': h.short_id(revision),
                 'branch': cs.branch,
                 'comment_username': user.username,
                 'threading': [revision_url, comment_url], # TODO: url to line number
+            }
         #pull request
         elif pull_request:
             notification_type = Notification.TYPE_PULL_REQUEST_COMMENT
             desc = comment.pull_request.title
             _org_ref_type, org_ref_name, _org_rev = comment.pull_request.org_ref.split(':')
             _url = h.url('pullrequest_show',
             pr_url = h.url('pullrequest_show',
                 repo_name=pull_request.other_repo.repo_name,
                 pull_request_id=pull_request.pull_request_id,
                 qualified=True,)
             comment_url = h.url('pullrequest_show',
                 repo_name=pull_request.other_repo.repo_name,
                 pull_request_id=pull_request.pull_request_id,
                 anchor='comment-%s' % comment.comment_id,
                 qualified=True,
+            )
             subj = safe_unicode(
                 h.link_to('Re pull request #%(pr_id)s: %(desc)s %(line)s' % \
                           {'desc': desc,
                            'pr_id': comment.pull_request.pull_request_id,
                            'line': line},
-                          _url)
+                          comment_url)
+            )
             # get the current participants of this pull request
             recipients = ChangesetComment.get_users(pull_request_id=
                                                 pull_request.pull_request_id)
             # add pull request author
             recipients += [pull_request.author]
@@ @@ -144,20 +153,21 @@ class ChangesetCommentsModel(BaseModel): @@
             #set some variables for email notification
             email_kwargs = {
                 'pr_title': pull_request.title,
                 'pr_id': pull_request.pull_request_id,
                 'status_change': status_change,
                 'closing_pr': closing_pr,
-                'pr_comment_url': _url,
+                'pr_comment_url': comment_url,
                 'pr_comment_user': h.person(user),
                 'pr_target_repo': h.url('summary_home',
                                    repo_name=pull_request.other_repo.repo_name,
                                    qualified=True),
                 'repo_name': pull_request.other_repo.repo_name,
                 'ref': org_ref_name,
                 'comment_username': user.username,
                 'threading': [pr_url, comment_url], # TODO: url to line number
+            }
         return subj, body, recipients, notification_type, email_kwargs
     def create(self, text, repo, user, revision=None, pull_request=None,
                f_path=None, line_no=None, status_change=None, closing_pr=False,

kallithea/model/notification.py

➞

Show inline comments

@@ @@ -111,12 +111,16 @@ class NotificationModel(BaseModel): @@
         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
         if 'threading' in email_kwargs:
             headers = {'References': ' '.join('<%s>' % x for x in email_kwargs['threading'])}
         # send email with notification to all other participants
         for rec in rec_objs:
             email_body = None  # we set body to none, we just send HTML emails
             ## this is passed into template
             kwargs = {'subject': subject,
                       'body': h.rst_w_mentions(body),
@@ @@ -128,13 +132,13 @@ class NotificationModel(BaseModel): @@
             email_subject = EmailNotificationModel()\
                                 .get_email_description(type_, **kwargs)
             email_body_html = EmailNotificationModel()\
                                 .get_email_tmpl(type_, **kwargs)
             run_task(tasks.send_email, [rec.email], email_subject, email_body,
                      email_body_html)
+                     email_body_html, headers)
         return notif
     def delete(self, user, notification):
         # we don't want to remove actual notification just the assignment
         try:

kallithea/model/pull_request.py

➞

Show inline comments

@@ @@ -141,12 +141,13 @@ class PullRequestModel(BaseModel): @@
             'pr_url': pr_url,
             'pr_revisions': revision_data,
             'repo_name': pr.other_repo.repo_name,
             'pr_id': pr.pull_request_id,
             'ref': org_ref_name,
             'pr_username': pr.author.username,
             'threading': [pr_url],
+            }
         NotificationModel().create(created_by=pr.author, subject=subject, body=body,
                                    recipients=reviewers,
                                    type_=Notification.TYPE_PULL_REQUEST,
                                    email_kwargs=email_kwargs)

0 comments (0 inline, 0 general)