X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Femailer.ts;h=88a06cb795e25c460d3039ff5408d0bf1e0fc5be;hb=2cdf27bae6acfaa0b99bb07555edc57f48b8bc43;hp=317cec70689693aba2b344fd4d0b257df203e7f4;hpb=f076daa76a32074cba162459e38fa8c130ad42d0;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index 317cec706..88a06cb79 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -1,7 +1,10 @@
 import { createTransport, Transporter } from 'nodemailer'
+import { UserRight } from '../../shared/models/users'
 import { isTestInstance } from '../helpers/core-utils'
-import { logger } from '../helpers/logger'
+import { bunyanLogger, logger } from '../helpers/logger'
 import { CONFIG } from '../initializers'
+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'
@@ -41,7 +44,9 @@ class Emailer {
         host: CONFIG.SMTP.HOSTNAME,
         port: CONFIG.SMTP.PORT,
         secure: CONFIG.SMTP.TLS,
-        ignoreTLS: isTestInstance(),
+        debug: CONFIG.LOG.LEVEL === 'debug',
+        logger: bunyanLogger as any,
+        ignoreTLS: CONFIG.SMTP.DISABLE_STARTTLS,
         tls,
         auth
       })
@@ -55,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()
@@ -68,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.`
@@ -82,6 +89,24 @@ class Emailer {
     return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
   }
 
+  async addVideoAbuseReport (videoId: number) {
+    const video = await VideoModel.load(videoId)
+
+    const text = `Hi,\n\n` +
+      `Your instance received an abuse for video the following video ${video.url}\n\n` +
+      `Cheers,\n` +
+      `PeerTube.`
+
+    const to = await UserModel.listEmailsWithRight(UserRight.MANAGE_VIDEO_ABUSES)
+    const emailPayload: EmailPayload = {
+      to,
+      subject: '[PeerTube] Received a video abuse',
+      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.')
@@ -96,7 +121,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)
   }