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 { UserAbuse, 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(/<br.?\/?>/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 {
}
}
- async checkConnectionOrDie () {
+ async checkConnection () {
if (!this.transporter || CONFIG.SMTP.TRANSPORT !== 'smtp') return
logger.info('Testing SMTP server...')
try {
const success = await this.transporter.verify()
- if (success !== true) this.dieOnConnectionFailure()
+ if (success !== true) this.warnOnConnectionFailure()
logger.info('Successfully connected to SMTP server.')
} catch (err) {
- this.dieOnConnectionFailure(err)
+ this.warnOnConnectionFailure(err)
}
}
}
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.` +
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',
accountName: comment.Account.getDisplayName(),
accountUrl: comment.Account.Actor.url,
comment,
+ commentHtml,
video,
videoUrl,
action: {
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',
subject: 'Mention on video ' + video.name,
locals: {
comment,
+ commentHtml,
video,
videoUrl,
accountName,
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()
const emailPayload: EmailPayload = {
template: 'user-registered',
to,
- subject: `a new user registered on ${WEBSERVER.HOST}: ${user.username}`,
+ subject: `a new user registered on ${CONFIG.INSTANCE.NAME}: ${user.username}`,
locals: {
user
}
const videoUrl = WEBSERVER.URL + videoBlacklist.Video.getWatchStaticPath()
const reasonString = videoBlacklist.reason ? ` for the following reason: ${videoBlacklist.reason}` : ''
- const blockedString = `Your video ${videoName} (${videoUrl} on ${WEBSERVER.HOST} has been blacklisted${reasonString}.`
+ const blockedString = `Your video ${videoName} (${videoUrl} on ${CONFIG.INSTANCE.NAME} has been blacklisted${reasonString}.`
const emailPayload: EmailPayload = {
to,
const emailPayload: EmailPayload = {
to,
subject: `Video ${video.name} unblacklisted`,
- text: `Your video "${video.name}" (${videoUrl}) on ${WEBSERVER.HOST} has been unblacklisted.`,
+ text: `Your video "${video.name}" (${videoUrl}) on ${CONFIG.INSTANCE.NAME} has been unblacklisted.`,
locals: {
title: 'Your video was unblacklisted'
}
const emailPayload: EmailPayload = {
template: 'verify-email',
to: [ to ],
- subject: `Verify your email on ${WEBSERVER.HOST}`,
+ subject: `Verify your email on ${CONFIG.INSTANCE.NAME}`,
locals: {
username,
verifyEmailUrl
const emailPayload: EmailPayload = {
to: [ to ],
subject: 'Account ' + blockedWord,
- text: `Your account ${user.username} on ${WEBSERVER.HOST} has been ${blockedWord}${reasonString}.`
+ text: `Your account ${user.username} on ${CONFIG.INSTANCE.NAME} has been ${blockedWord}${reasonString}.`
}
return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
locals: {
fromName,
fromEmail,
- body
+ body,
+
+ // There are not notification preferences for the contact form
+ hideNotificationPreferences: true
}
}
const fromDisplayName = options.from
? options.from
- : WEBSERVER.HOST
+ : CONFIG.INSTANCE.NAME
const email = new Email({
send: true,
locals: { // default variables available in all templates
WEBSERVER,
EMAIL: CONFIG.EMAIL,
+ instanceName: CONFIG.INSTANCE.NAME,
text: options.text,
subject: options.subject
}
}
}
- private dieOnConnectionFailure (err?: Error) {
+ private warnOnConnectionFailure (err?: Error) {
logger.error('Failed to connect to SMTP %s:%d.', CONFIG.SMTP.HOSTNAME, CONFIG.SMTP.PORT, { err })
- process.exit(-1)
}
static get Instance () {
projects / github / Chocobozzz / PeerTube.git / blobdiff