diff options
author | Kimsible <1877318+kimsible@users.noreply.github.com> | 2020-11-07 22:59:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-07 22:59:58 +0100 |
commit | 98b94643127d881cbc09a12812185aed44173f16 (patch) | |
tree | 69759b1a15c1f013c2f4ee411a7abf4d19298bc1 /server | |
parent | a4879b53759ac8db1405351103c7a4a8a700a768 (diff) | |
download | PeerTube-98b94643127d881cbc09a12812185aed44173f16.tar.gz PeerTube-98b94643127d881cbc09a12812185aed44173f16.tar.zst PeerTube-98b94643127d881cbc09a12812185aed44173f16.zip |
render html/markdown for new comment notification email (#3255)
Co-authored-by: kimsible <kimsible@users.noreply.github.com>
Co-authored-by: Rigel Kent <sendmemail@rigelk.eu>
Diffstat (limited to 'server')
-rw-r--r-- | server/lib/emailer.ts | 51 | ||||
-rw-r--r-- | server/lib/emails/video-comment-mention/html.pug | 6 | ||||
-rw-r--r-- | server/lib/emails/video-comment-new/html.pug | 6 |
3 files changed, 57 insertions, 6 deletions
diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts index 25b0aaedd..6532fb4b4 100644 --- a/server/lib/emailer.ts +++ b/server/lib/emailer.ts | |||
@@ -15,6 +15,53 @@ import { MAbuseFull, MAbuseMessage, MAccountDefault, MActorFollowActors, MActorF | |||
15 | import { MCommentOwnerVideo, MVideo, MVideoAccountLight } from '../types/models/video' | 15 | import { MCommentOwnerVideo, MVideo, MVideoAccountLight } from '../types/models/video' |
16 | import { JobQueue } from './job-queue' | 16 | import { JobQueue } from './job-queue' |
17 | 17 | ||
18 | const sanitizeHtml = require('sanitize-html') | ||
19 | const markdownItEmoji = require('markdown-it-emoji/light') | ||
20 | const MarkdownItClass = require('markdown-it') | ||
21 | const markdownIt = new MarkdownItClass('default', { linkify: true, breaks: true, html: true }) | ||
22 | |||
23 | markdownIt.enable([ | ||
24 | 'linkify', | ||
25 | 'autolink', | ||
26 | 'emphasis', | ||
27 | 'link', | ||
28 | 'newline', | ||
29 | 'list' | ||
30 | ]) | ||
31 | |||
32 | markdownIt.use(markdownItEmoji) | ||
33 | |||
34 | const toSafeHtml = text => { | ||
35 | // Restore line feed | ||
36 | const textWithLineFeed = text.replace(/<br.?\/?>/g, '\r\n') | ||
37 | |||
38 | // Convert possible markdown (emojis, emphasis and lists) to html | ||
39 | const html = markdownIt.render(textWithLineFeed) | ||
40 | |||
41 | // Convert to safe Html | ||
42 | return sanitizeHtml(html, { | ||
43 | allowedTags: [ 'a', 'p', 'span', 'br', 'strong', 'em', 'ul', 'ol', 'li' ], | ||
44 | allowedSchemes: [ 'http', 'https' ], | ||
45 | allowedAttributes: { | ||
46 | a: [ 'href', 'class', 'target', 'rel' ] | ||
47 | }, | ||
48 | transformTags: { | ||
49 | a: (tagName, attribs) => { | ||
50 | let rel = 'noopener noreferrer' | ||
51 | if (attribs.rel === 'me') rel += ' me' | ||
52 | |||
53 | return { | ||
54 | tagName, | ||
55 | attribs: Object.assign(attribs, { | ||
56 | target: '_blank', | ||
57 | rel | ||
58 | }) | ||
59 | } | ||
60 | } | ||
61 | } | ||
62 | }) | ||
63 | } | ||
64 | |||
18 | const Email = require('email-templates') | 65 | const Email = require('email-templates') |
19 | 66 | ||
20 | class Emailer { | 67 | class Emailer { |
@@ -236,6 +283,7 @@ class Emailer { | |||
236 | const video = comment.Video | 283 | const video = comment.Video |
237 | const videoUrl = WEBSERVER.URL + comment.Video.getWatchStaticPath() | 284 | const videoUrl = WEBSERVER.URL + comment.Video.getWatchStaticPath() |
238 | const commentUrl = WEBSERVER.URL + comment.getCommentStaticPath() | 285 | const commentUrl = WEBSERVER.URL + comment.getCommentStaticPath() |
286 | const commentHtml = toSafeHtml(comment.text) | ||
239 | 287 | ||
240 | const emailPayload: EmailPayload = { | 288 | const emailPayload: EmailPayload = { |
241 | template: 'video-comment-new', | 289 | template: 'video-comment-new', |
@@ -245,6 +293,7 @@ class Emailer { | |||
245 | accountName: comment.Account.getDisplayName(), | 293 | accountName: comment.Account.getDisplayName(), |
246 | accountUrl: comment.Account.Actor.url, | 294 | accountUrl: comment.Account.Actor.url, |
247 | comment, | 295 | comment, |
296 | commentHtml, | ||
248 | video, | 297 | video, |
249 | videoUrl, | 298 | videoUrl, |
250 | action: { | 299 | action: { |
@@ -262,6 +311,7 @@ class Emailer { | |||
262 | const video = comment.Video | 311 | const video = comment.Video |
263 | const videoUrl = WEBSERVER.URL + comment.Video.getWatchStaticPath() | 312 | const videoUrl = WEBSERVER.URL + comment.Video.getWatchStaticPath() |
264 | const commentUrl = WEBSERVER.URL + comment.getCommentStaticPath() | 313 | const commentUrl = WEBSERVER.URL + comment.getCommentStaticPath() |
314 | const commentHtml = toSafeHtml(comment.text) | ||
265 | 315 | ||
266 | const emailPayload: EmailPayload = { | 316 | const emailPayload: EmailPayload = { |
267 | template: 'video-comment-mention', | 317 | template: 'video-comment-mention', |
@@ -269,6 +319,7 @@ class Emailer { | |||
269 | subject: 'Mention on video ' + video.name, | 319 | subject: 'Mention on video ' + video.name, |
270 | locals: { | 320 | locals: { |
271 | comment, | 321 | comment, |
322 | commentHtml, | ||
272 | video, | 323 | video, |
273 | videoUrl, | 324 | videoUrl, |
274 | accountName, | 325 | accountName, |
diff --git a/server/lib/emails/video-comment-mention/html.pug b/server/lib/emails/video-comment-mention/html.pug index 9e9ced62d..a34c6b090 100644 --- a/server/lib/emails/video-comment-mention/html.pug +++ b/server/lib/emails/video-comment-mention/html.pug | |||
@@ -5,7 +5,7 @@ block title | |||
5 | 5 | ||
6 | block content | 6 | block content |
7 | p. | 7 | p. |
8 | #[a(href=accountUrl title=handle) #{accountName}] mentioned you in a comment on video | 8 | #[a(href=accountUrl title=handle) #{accountName}] mentioned you in a comment on video |
9 | "#[a(href=videoUrl) #{video.name}]": | 9 | "#[a(href=videoUrl) #{video.name}]": |
10 | blockquote #{comment.text} | 10 | blockquote !{commentHtml} |
11 | br(style="display: none;") \ No newline at end of file | 11 | br(style="display: none;") |
diff --git a/server/lib/emails/video-comment-new/html.pug b/server/lib/emails/video-comment-new/html.pug index 075af5717..cbb683fee 100644 --- a/server/lib/emails/video-comment-new/html.pug +++ b/server/lib/emails/video-comment-new/html.pug | |||
@@ -5,7 +5,7 @@ block title | |||
5 | 5 | ||
6 | block content | 6 | block content |
7 | p. | 7 | p. |
8 | #[a(href=accountUrl title=handle) #{accountName}] added a comment on your video | 8 | #[a(href=accountUrl title=handle) #{accountName}] added a comment on your video |
9 | "#[a(href=videoUrl) #{video.name}]": | 9 | "#[a(href=videoUrl) #{video.name}]": |
10 | blockquote #{comment.text} | 10 | blockquote !{commentHtml} |
11 | br(style="display: none;") \ No newline at end of file | 11 | br(style="display: none;") |