X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Femailer.ts;h=9327792fb6f8a731e10e252f2325218eff24dfdd;hb=a2377d15ee09301cf4cc5434ad865a21918da15f;hp=9c105a57530021c7c163d10dc5aeb076d05ff6d5;hpb=05e67d6206669b4a17e786038b1923e79bacb196;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index 9c105a575..9327792fb 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -7,7 +7,7 @@ import { UserModel } from '../models/account/user'
 import { VideoModel } from '../models/video/video'
 import { JobQueue } from './job-queue'
 import { EmailPayload } from './job-queue/handlers/email'
-import { readFileSync } from 'fs'
+import { readFileSync } from 'fs-extra'
 
 class Emailer {
 
@@ -46,7 +46,7 @@ class Emailer {
         secure: CONFIG.SMTP.TLS,
         debug: CONFIG.LOG.LEVEL === 'debug',
         logger: bunyanLogger as any,
-        ignoreTLS: isTestInstance(),
+        ignoreTLS: CONFIG.SMTP.DISABLE_STARTTLS,
         tls,
         auth
       })
@@ -60,6 +60,8 @@ class Emailer {
   async checkConnectionOrDie () {
     if (!this.transporter) return
 
+    logger.info('Testing SMTP server...')
+
     try {
       const success = await this.transporter.verify()
       if (success !== true) this.dieOnConnectionFailure()
@@ -73,7 +75,7 @@ class Emailer {
   addForgetPasswordEmailJob (to: string, resetPasswordUrl: string) {
     const text = `Hi dear user,\n\n` +
       `It seems you forgot your password on ${CONFIG.WEBSERVER.HOST}! ` +
-      `Please follow this link to reset it: ${resetPasswordUrl}.\n\n` +
+      `Please follow this link to reset it: ${resetPasswordUrl}\n\n` +
       `If you are not the person who initiated this request, please ignore this email.\n\n` +
       `Cheers,\n` +
       `PeerTube.`
@@ -87,11 +89,29 @@ class Emailer {
     return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
   }
 
-  async addVideoAbuseReport (videoId: number) {
+  addVerifyEmailJob (to: string, verifyEmailUrl: string) {
+    const text = `Welcome to PeerTube,\n\n` +
+      `To start using PeerTube on ${CONFIG.WEBSERVER.HOST} you must  verify your email! ` +
+      `Please follow this link to verify this email belongs to you: ${verifyEmailUrl}\n\n` +
+      `If you are not the person who initiated this request, please ignore this email.\n\n` +
+      `Cheers,\n` +
+      `PeerTube.`
+
+    const emailPayload: EmailPayload = {
+      to: [ to ],
+      subject: 'Verify your PeerTube email',
+      text
+    }
+
+    return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
+  }
+
+  async addVideoAbuseReportJob (videoId: number) {
     const video = await VideoModel.load(videoId)
+    if (!video) throw new Error('Unknown Video id during Abuse report.')
 
     const text = `Hi,\n\n` +
-      `Your instance received an abuse for video the following video ${video.url}\n\n` +
+      `Your instance received an abuse for the following video ${video.url}\n\n` +
       `Cheers,\n` +
       `PeerTube.`
 
@@ -105,6 +125,78 @@ class Emailer {
     return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
   }
 
+  async addVideoBlacklistReportJob (videoId: number, reason?: string) {
+    const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoId)
+    if (!video) throw new Error('Unknown Video id during Blacklist report.')
+    // It's not our user
+    if (video.remote === true) return
+
+    const user = await UserModel.loadById(video.VideoChannel.Account.userId)
+
+    const reasonString = reason ? ` for the following reason: ${reason}` : ''
+    const blockedString = `Your video ${video.name} on ${CONFIG.WEBSERVER.HOST} has been blacklisted${reasonString}.`
+
+    const text = 'Hi,\n\n' +
+      blockedString +
+      '\n\n' +
+      'Cheers,\n' +
+      `PeerTube.`
+
+    const to = user.email
+    const emailPayload: EmailPayload = {
+      to: [ to ],
+      subject: `[PeerTube] Video ${video.name} blacklisted`,
+      text
+    }
+
+    return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
+  }
+
+  async addVideoUnblacklistReportJob (videoId: number) {
+    const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoId)
+    if (!video) throw new Error('Unknown Video id during Blacklist report.')
+    // It's not our user
+    if (video.remote === true) return
+
+    const user = await UserModel.loadById(video.VideoChannel.Account.userId)
+
+    const text = 'Hi,\n\n' +
+      `Your video ${video.name} on ${CONFIG.WEBSERVER.HOST} has been unblacklisted.` +
+      '\n\n' +
+      'Cheers,\n' +
+      `PeerTube.`
+
+    const to = user.email
+    const emailPayload: EmailPayload = {
+      to: [ to ],
+      subject: `[PeerTube] Video ${video.name} unblacklisted`,
+      text
+    }
+
+    return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
+  }
+
+  addUserBlockJob (user: UserModel, blocked: boolean, reason?: string) {
+    const reasonString = reason ? ` for the following reason: ${reason}` : ''
+    const blockedWord = blocked ? 'blocked' : 'unblocked'
+    const blockedString = `Your account ${user.username} on ${CONFIG.WEBSERVER.HOST} has been ${blockedWord}${reasonString}.`
+
+    const text = 'Hi,\n\n' +
+      blockedString +
+      '\n\n' +
+      'Cheers,\n' +
+      `PeerTube.`
+
+    const to = user.email
+    const emailPayload: EmailPayload = {
+      to: [ to ],
+      subject: '[PeerTube] Account ' + blockedWord,
+      text
+    }
+
+    return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
+  }
+
   sendMail (to: string[], subject: string, text: string) {
     if (!this.transporter) {
       throw new Error('Cannot send mail because SMTP is not configured.')
@@ -119,7 +211,7 @@ class Emailer {
   }
 
   private dieOnConnectionFailure (err?: Error) {
-    logger.error('Failed to connect to SMTP %s:%d.', CONFIG.SMTP.HOSTNAME, CONFIG.SMTP.PORT, err)
+    logger.error('Failed to connect to SMTP %s:%d.', CONFIG.SMTP.HOSTNAME, CONFIG.SMTP.PORT, { err })
     process.exit(-1)
   }