Merge lp:~daker/launchpad/fix.1600499 into lp:launchpad

[Adnane Belmadiaf]

Add support for Gmail go-to actions

[Colin Watson (cjwatson)]

Thanks for the patch.

These were previously plain-text emails sent to non-Gmail users as well. Dumping HTML-like markup into the start of them without even a Content-Type change is not going to look good at all to anyone who doesn't use Gmail; and I would be wary of making them anything other than text/plain anyway.

Can you point to the specification for this actions markup? We need to find some approach that's a bit less horribly intrusive, if indeed it's worth doing. As a last resort it may require a new PersonSettings column, but it will depend on what options the spec affords us. For example, if it were possible to do this by way of additional message headers, that would be *much* better than dumping JSON into the message body.

Whatever approach ends up being workable, this needs to include tests.

review: Needs Fixing

[Adnane Belmadiaf (daker)]

Thanks for reply, i just checked LP emails, indeed it's sent as text/plain, to solve this the email need to be sent as multipart/alternative, which then will include both versions the text/plain & text/html, the email client will choose which version to display depending on the user settings, here is the markup reference https://developers.google.com/gmail/markup/reference/go-to-action#view_action

[lp:~daker/launchpad/fix.1600499]

18127. By Adnane Belmadiaf on 2016-07-10

Restore trailing space

18128. By Adnane Belmadiaf on 2016-07-10

Restore more trailing space

[Colin Watson (cjwatson)]

It appears that Gmail doesn't support any header-based method, which is deeply unfortunate. I'm not at all sure that it's worth cluttering our emails with multipart/alternative cruft just for this, but if it is then you'd probably need to start somewhere in BaseMailer.

Unmerged revisions

18128. By Adnane Belmadiaf on 2016-07-10

Restore more trailing space

18127. By Adnane Belmadiaf on 2016-07-10

Restore trailing space

18126. By Adnane Belmadiaf on 2016-07-09

Add more gmail actions

18125. By Adnane Belmadiaf on 2016-07-09

Add Gmail actions markup

=== modified file 'lib/lp/bugs/emailtemplates/bug-notification-verbose.txt'
--- lib/lp/bugs/emailtemplates/bug-notification-verbose.txt	2011-06-15 11:19:21 +0000
+++ lib/lp/bugs/emailtemplates/bug-notification-verbose.txt	2016-07-10 20:33:39 +0000
@@ -1,3 +1,15 @@
+<script type="application/ld+json">
+{
+  "@context": "http://schema.org",
+  "@type": "EmailMessage",
+  "potentialAction": {
+    "@type": "ViewAction",
+    "name": "View Bug",
+    "url": "%(bug_url)s"
+  },
+  "description": ""
+}
+</script>
 %(content)s
 
 -- 

=== modified file 'lib/lp/bugs/emailtemplates/bug-notification.txt'
--- lib/lp/bugs/emailtemplates/bug-notification.txt	2011-06-15 11:19:21 +0000
+++ lib/lp/bugs/emailtemplates/bug-notification.txt	2016-07-10 20:33:39 +0000
@@ -1,3 +1,15 @@
+<script type="application/ld+json">
+{
+  "@context": "http://schema.org",
+  "@type": "EmailMessage",
+  "potentialAction": {
+    "@type": "ViewAction",
+    "name": "View Bug",
+    "url": "%(bug_url)s"
+  },
+  "description": ""
+}
+</script>
 %(content)s
 
 -- 

=== modified file 'lib/lp/code/emailtemplates/branch-merge-proposal-created.txt'
--- lib/lp/code/emailtemplates/branch-merge-proposal-created.txt	2014-11-14 12:30:28 +0000
+++ lib/lp/code/emailtemplates/branch-merge-proposal-created.txt	2016-07-10 20:33:39 +0000
@@ -1,3 +1,15 @@
+<script type="application/ld+json">
+{
+  "@context": "http://schema.org",
+  "@type": "EmailMessage",
+  "potentialAction": {
+    "@type": "ViewAction",
+    "name": "View Merge Request",
+    "url": "%(proposal_url)s"
+  },
+  "description": ""
+}
+</script>
 %(proposal_registrant)s has proposed merging %(source_branch)s into %(target_branch)s%(prerequisite)s.
 
 %(commit_message)s%(reviews)s%(related_bugtasks)s

=== modified file 'lib/lp/code/emailtemplates/branch-merge-proposal-updated.txt'
--- lib/lp/code/emailtemplates/branch-merge-proposal-updated.txt	2014-11-14 12:30:28 +0000
+++ lib/lp/code/emailtemplates/branch-merge-proposal-updated.txt	2016-07-10 20:33:39 +0000
@@ -1,3 +1,15 @@
+<script type="application/ld+json">
+{
+  "@context": "http://schema.org",
+  "@type": "EmailMessage",
+  "potentialAction": {
+    "@type": "ViewAction",
+    "name": "View Merge Request",
+    "url": "%(proposal_url)s"
+  },
+  "description": ""
+}
+</script>
 The proposal to merge %(source_branch)s into %(target_branch)s has been updated.
 
 %(delta)s

=== modified file 'lib/lp/code/emailtemplates/branch-modified.txt'
--- lib/lp/code/emailtemplates/branch-modified.txt	2011-12-18 22:31:46 +0000
+++ lib/lp/code/emailtemplates/branch-modified.txt	2016-07-10 20:33:39 +0000
@@ -1,3 +1,15 @@
+<script type="application/ld+json">
+{
+  "@context": "http://schema.org",
+  "@type": "EmailMessage",
+  "potentialAction": {
+    "@type": "ViewAction",
+    "name": "View Branch",
+    "url": "%(branch_url)s"
+  },
+  "description": ""
+}
+</script>
 %(diff)s%(delta)s
 
 --

=== modified file 'lib/lp/code/emailtemplates/review-requested.txt'
--- lib/lp/code/emailtemplates/review-requested.txt	2014-11-14 12:30:28 +0000
+++ lib/lp/code/emailtemplates/review-requested.txt	2016-07-10 20:33:39 +0000
@@ -1,3 +1,15 @@
+<script type="application/ld+json">
+{
+  "@context": "http://schema.org",
+  "@type": "EmailMessage",
+  "potentialAction": {
+    "@type": "ViewAction",
+    "name": "View Merge Request",
+    "url": "%(proposal_url)s"
+  },
+  "description": ""
+}
+</script>
 You have been requested to review the proposed merge of %(source_branch)s into %(target_branch)s.
 
 For more details, see: