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 { 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 { SendEmailDefaultOptions } 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 { MAbuseFull, MAbuseMessage, MAccountDefault, MActorFollowActors, MActorFollowFull, MPlugin, 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)
-}
+import { toSafeHtml } from '../helpers/markdown'
const Email = require('email-templates')
async addVideoAutoBlacklistModeratorsNotification (to: string[], videoBlacklist: MVideoBlacklistLightVideo) {
const videoAutoBlacklistUrl = WEBSERVER.URL + '/admin/moderation/video-auto-blacklist/list'
const videoUrl = WEBSERVER.URL + videoBlacklist.Video.getWatchStaticPath()
- const channel = (await VideoChannelModel.loadByIdAndPopulateAccount(videoBlacklist.Video.channelId)).toFormattedSummaryJSON()
+ const channel = (await VideoChannelModel.loadAndPopulateAccount(videoBlacklist.Video.channelId)).toFormattedSummaryJSON()
const emailPayload: EmailPayload = {
template: 'video-auto-blacklist-new',
}
addNewPeerTubeVersionNotification (to: string[], latestVersion: string) {
- const subject = `A new PeerTube version is available: ${latestVersion}`
-
const emailPayload: EmailPayload = {
to,
template: 'peertube-version-new',
- subject,
- text: subject,
+ subject: `A new PeerTube version is available: ${latestVersion}`,
locals: {
latestVersion
}
addNewPlugionVersionNotification (to: string[], plugin: MPlugin) {
const pluginUrl = WEBSERVER.URL + '/admin/plugins/list-installed?pluginType=' + plugin.type
- const subject = `A new plugin/theme version is available: ${plugin.name}@${plugin.latestVersion}`
-
const emailPayload: EmailPayload = {
to,
template: 'plugin-version-new',
- subject,
- text: subject,
+ subject: `A new plugin/theme version is available: ${plugin.name}@${plugin.latestVersion}`,
locals: {
pluginName: plugin.name,
latestVersion: plugin.latestVersion,
})
for (const to of options.to) {
- await email
- .send(merge(
- {
- template: 'common',
- message: {
- to,
- from: options.from,
- subject: options.subject,
- replyTo: options.replyTo
- },
- locals: { // default variables available in all templates
- WEBSERVER,
- EMAIL: CONFIG.EMAIL,
- instanceName: CONFIG.INSTANCE.NAME,
- text: options.text,
- subject: options.subject
- }
- },
- options // overriden/new variables given for a specific template in the payload
- ) as SendEmailOptions)
+ const baseOptions: SendEmailDefaultOptions = {
+ template: 'common',
+ message: {
+ to,
+ from: options.from,
+ subject: options.subject,
+ replyTo: options.replyTo
+ },
+ locals: { // default variables available in all templates
+ WEBSERVER,
+ EMAIL: CONFIG.EMAIL,
+ instanceName: CONFIG.INSTANCE.NAME,
+ text: options.text,
+ subject: options.subject
+ }
+ }
+
+ // overriden/new variables given for a specific template in the payload
+ const sendOptions = merge(baseOptions, options)
+
+ await email.send(sendOptions)
.then(res => logger.debug('Sent email.', { res }))
.catch(err => logger.error('Error in email sender.', { err }))
}
this.transporter = createTransport({
sendmail: true,
newline: 'unix',
- path: CONFIG.SMTP.SENDMAIL
+ path: CONFIG.SMTP.SENDMAIL,
+ logger: bunyanLogger as any
})
}