X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Femailer.ts;h=650a3c090948b2a19e533b4ea89b550ddaf7a56b;hb=daf6e4801052d3ca6be2fafd20bae2323b1ce175;hp=a5664408de9b36784f6f2c014118a0d7a97aa509;hpb=4f32032fed8587ea97d45e235b167e8958efd81f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts index a5664408d..650a3c090 100644 --- a/server/lib/emailer.ts +++ b/server/lib/emailer.ts @@ -5,16 +5,37 @@ import { join } from 'path' import { VideoChannelModel } from '@server/models/video/video-channel' import { MVideoBlacklistLightVideo, MVideoBlacklistVideo } from '@server/types/models/video/video-blacklist' import { MVideoImport, MVideoImportVideo } from '@server/types/models/video/video-import' -import { Abuse, EmailPayload } from '@shared/models' +import { SANITIZE_OPTIONS, TEXT_WITH_HTML_RULES } from '@shared/core-utils' +import { AbuseState, EmailPayload, UserAbuse } from '@shared/models' import { SendEmailOptions } from '../../shared/models/server/emailer.model' import { isTestInstance, root } from '../helpers/core-utils' import { bunyanLogger, logger } from '../helpers/logger' import { CONFIG, isEmailEnabled } from '../initializers/config' import { WEBSERVER } from '../initializers/constants' -import { MAbuseFull, MActorFollowActors, MActorFollowFull, MUser } from '../types/models' +import { MAbuseFull, MAbuseMessage, MAccountDefault, MActorFollowActors, MActorFollowFull, MUser } from '../types/models' import { MCommentOwnerVideo, MVideo, MVideoAccountLight } from '../types/models/video' import { JobQueue } from './job-queue' +const sanitizeHtml = require('sanitize-html') +const markdownItEmoji = require('markdown-it-emoji/light') +const MarkdownItClass = require('markdown-it') +const markdownIt = new MarkdownItClass('default', { linkify: true, breaks: true, html: true }) + +markdownIt.enable(TEXT_WITH_HTML_RULES) + +markdownIt.use(markdownItEmoji) + +const toSafeHtml = text => { + // Restore line feed + const textWithLineFeed = text.replace(//g, '\r\n') + + // Convert possible markdown (emojis, emphasis and lists) to html + const html = markdownIt.render(textWithLineFeed) + + // Convert to safe Html + return sanitizeHtml(html, SANITIZE_OPTIONS) +} + const Email = require('email-templates') class Emailer { @@ -209,7 +230,7 @@ class Emailer { } myVideoImportErrorNotification (to: string[], videoImport: MVideoImport) { - const importUrl = WEBSERVER.URL + '/my-account/video-imports' + const importUrl = WEBSERVER.URL + '/my-library/video-imports' const text = `Your video import "${videoImport.getTargetIdentifier()}" encountered an error.` + @@ -236,6 +257,7 @@ class Emailer { const video = comment.Video const videoUrl = WEBSERVER.URL + comment.Video.getWatchStaticPath() const commentUrl = WEBSERVER.URL + comment.getCommentStaticPath() + const commentHtml = toSafeHtml(comment.text) const emailPayload: EmailPayload = { template: 'video-comment-new', @@ -245,6 +267,7 @@ class Emailer { accountName: comment.Account.getDisplayName(), accountUrl: comment.Account.Actor.url, comment, + commentHtml, video, videoUrl, action: { @@ -262,6 +285,7 @@ class Emailer { const video = comment.Video const videoUrl = WEBSERVER.URL + comment.Video.getWatchStaticPath() const commentUrl = WEBSERVER.URL + comment.getCommentStaticPath() + const commentHtml = toSafeHtml(comment.text) const emailPayload: EmailPayload = { template: 'video-comment-mention', @@ -269,6 +293,7 @@ class Emailer { subject: 'Mention on video ' + video.name, locals: { comment, + commentHtml, video, videoUrl, accountName, @@ -283,7 +308,7 @@ class Emailer { } addAbuseModeratorsNotification (to: string[], parameters: { - abuse: Abuse + abuse: UserAbuse abuseInstance: MAbuseFull reporter: string }) { @@ -311,7 +336,8 @@ class Emailer { videoPublishedAt: new Date(video.publishedAt).toLocaleString(), videoName: video.name, reason: abuse.reason, - videoChannel: video.VideoChannel, + videoChannel: abuse.video.channel, + reporter, action } } @@ -325,10 +351,12 @@ class Emailer { subject: `New comment abuse report from ${reporter}`, locals: { commentUrl, + videoName: comment.Video.name, isLocal: comment.isOwned(), commentCreatedAt: new Date(comment.createdAt).toLocaleString(), reason: abuse.reason, flaggedAccount: abuseInstance.FlaggedAccount.getDisplayName(), + reporter, action } } @@ -345,6 +373,7 @@ class Emailer { accountDisplayName: account.getDisplayName(), isLocal: account.isOwned(), reason: abuse.reason, + reporter, action } } @@ -353,6 +382,69 @@ class Emailer { return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload }) } + addAbuseStateChangeNotification (to: string[], abuse: MAbuseFull) { + const text = abuse.state === AbuseState.ACCEPTED + ? 'Report #' + abuse.id + ' has been accepted' + : 'Report #' + abuse.id + ' has been rejected' + + const abuseUrl = WEBSERVER.URL + '/my-account/abuses?search=%23' + abuse.id + + const action = { + text, + url: abuseUrl + } + + const emailPayload: EmailPayload = { + template: 'abuse-state-change', + to, + subject: text, + locals: { + action, + abuseId: abuse.id, + abuseUrl, + isAccepted: abuse.state === AbuseState.ACCEPTED + } + } + + return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload }) + } + + addAbuseNewMessageNotification ( + to: string[], + options: { + target: 'moderator' | 'reporter' + abuse: MAbuseFull + message: MAbuseMessage + accountMessage: MAccountDefault + }) { + const { abuse, target, message, accountMessage } = options + + const text = 'New message on report #' + abuse.id + const abuseUrl = target === 'moderator' + ? WEBSERVER.URL + '/admin/moderation/abuses/list?search=%23' + abuse.id + : WEBSERVER.URL + '/my-account/abuses?search=%23' + abuse.id + + const action = { + text, + url: abuseUrl + } + + const emailPayload: EmailPayload = { + template: 'abuse-new-message', + to, + subject: text, + locals: { + abuseId: abuse.id, + abuseUrl: action.url, + messageAccountName: accountMessage.getDisplayName(), + messageText: message.message, + action + } + } + + return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload }) + } + async addVideoAutoBlacklistModeratorsNotification (to: string[], videoBlacklist: MVideoBlacklistLightVideo) { const VIDEO_AUTO_BLACKLIST_URL = WEBSERVER.URL + '/admin/moderation/video-auto-blacklist/list' const videoUrl = WEBSERVER.URL + videoBlacklist.Video.getWatchStaticPath() @@ -423,12 +515,13 @@ class Emailer { return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload }) } - addPasswordResetEmailJob (to: string, resetPasswordUrl: string) { + addPasswordResetEmailJob (username: string, to: string, resetPasswordUrl: string) { const emailPayload: EmailPayload = { template: 'password-reset', to: [ to ], subject: 'Reset your account password', locals: { + username, resetPasswordUrl } } @@ -450,12 +543,13 @@ class Emailer { return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload }) } - addVerifyEmailJob (to: string, verifyEmailUrl: string) { + addVerifyEmailJob (username: string, to: string, verifyEmailUrl: string) { const emailPayload: EmailPayload = { template: 'verify-email', to: [ to ], subject: `Verify your email on ${WEBSERVER.HOST}`, locals: { + username, verifyEmailUrl } } @@ -486,7 +580,10 @@ class Emailer { locals: { fromName, fromEmail, - body + body, + + // There are not notification preferences for the contact form + hideNotificationPreferences: true } }