X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Femailer.ts;h=26262972d42e90fc35383991fd22384f6d35dcfa;hb=daaaf3c487f188e54556c6d556d95ee6c2a31bce;hp=76349ef8f0f23753c41b97cb02ccc875df07ae5d;hpb=d5c8932a601c1854db0a2e399ccaf26e17385f1a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index 76349ef8f..26262972d 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -1,13 +1,20 @@
 import { createTransport, Transporter } from 'nodemailer'
 import { isTestInstance } from '../helpers/core-utils'
 import { bunyanLogger, logger } from '../helpers/logger'
-import { CONFIG } from '../initializers/config'
+import { CONFIG, isEmailEnabled } from '../initializers/config'
 import { JobQueue } from './job-queue'
 import { EmailPayload } from './job-queue/handlers/email'
 import { readFileSync } from 'fs-extra'
 import { WEBSERVER } from '../initializers/constants'
-import { MCommentOwnerVideo, MVideo, MVideoAbuseVideo, MVideoAccountLight, MVideoBlacklistVideo } from '../typings/models/video'
-import { MActorFollowActors, MActorFollowFollowingFullFollowerAccount, MUser } from '../typings/models'
+import {
+  MCommentOwnerVideo,
+  MVideo,
+  MVideoAbuseVideo,
+  MVideoAccountLight,
+  MVideoBlacklistLightVideo,
+  MVideoBlacklistVideo
+} from '../typings/models/video'
+import { MActorFollowActors, MActorFollowFull, MUser } from '../typings/models'
 import { MVideoImport, MVideoImportVideo } from '@server/typings/models/video/video-import'
 
 type SendEmailOptions = {
@@ -25,14 +32,15 @@ class Emailer {
   private initialized = false
   private transporter: Transporter
 
-  private constructor () {}
+  private constructor () {
+  }
 
   init () {
     // Already initialized
     if (this.initialized === true) return
     this.initialized = true
 
-    if (Emailer.isEnabled()) {
+    if (isEmailEnabled()) {
       logger.info('Using %s:%s as SMTP server.', CONFIG.SMTP.HOSTNAME, CONFIG.SMTP.PORT)
 
       let tls
@@ -90,12 +98,12 @@ class Emailer {
     const channelName = video.VideoChannel.getDisplayName()
     const videoUrl = WEBSERVER.URL + video.getWatchStaticPath()
 
-    const text = `Hi dear user,\n\n` +
+    const text = 'Hi dear user,\n\n' +
       `Your subscription ${channelName} just published a new video: ${video.name}` +
-      `\n\n` +
+      '\n\n' +
       `You can view it on ${videoUrl} ` +
-      `\n\n` +
-      `Cheers,\n` +
+      '\n\n' +
+      'Cheers,\n' +
       `${CONFIG.EMAIL.BODY.SIGNATURE}`
 
     const emailPayload: EmailPayload = {
@@ -107,14 +115,14 @@ class Emailer {
     return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
   }
 
-  addNewFollowNotification (to: string[], actorFollow: MActorFollowFollowingFullFollowerAccount, followType: 'account' | 'channel') {
+  addNewFollowNotification (to: string[], actorFollow: MActorFollowFull, followType: 'account' | 'channel') {
     const followerName = actorFollow.ActorFollower.Account.getDisplayName()
     const followingName = (actorFollow.ActorFollowing.VideoChannel || actorFollow.ActorFollowing.Account).getDisplayName()
 
-    const text = `Hi dear user,\n\n` +
+    const text = 'Hi dear user,\n\n' +
       `Your ${followType} ${followingName} has a new subscriber: ${followerName}` +
-      `\n\n` +
-      `Cheers,\n` +
+      '\n\n' +
+      'Cheers,\n' +
       `${CONFIG.EMAIL.BODY.SIGNATURE}`
 
     const emailPayload: EmailPayload = {
@@ -129,10 +137,10 @@ class Emailer {
   addNewInstanceFollowerNotification (to: string[], actorFollow: MActorFollowActors) {
     const awaitingApproval = actorFollow.state === 'pending' ? ' awaiting manual approval.' : ''
 
-    const text = `Hi dear admin,\n\n` +
+    const text = 'Hi dear admin,\n\n' +
       `Your instance has a new follower: ${actorFollow.ActorFollower.url}${awaitingApproval}` +
-      `\n\n` +
-      `Cheers,\n` +
+      '\n\n' +
+      'Cheers,\n' +
       `${CONFIG.EMAIL.BODY.SIGNATURE}`
 
     const emailPayload: EmailPayload = {
@@ -144,15 +152,31 @@ class Emailer {
     return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
   }
 
+  addAutoInstanceFollowingNotification (to: string[], actorFollow: MActorFollowActors) {
+    const text = 'Hi dear admin,\n\n' +
+      `Your instance automatically followed a new instance: ${actorFollow.ActorFollowing.url}` +
+      '\n\n' +
+      'Cheers,\n' +
+      `${CONFIG.EMAIL.BODY.SIGNATURE}`
+
+    const emailPayload: EmailPayload = {
+      to,
+      subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'Auto instance following',
+      text
+    }
+
+    return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
+  }
+
   myVideoPublishedNotification (to: string[], video: MVideo) {
     const videoUrl = WEBSERVER.URL + video.getWatchStaticPath()
 
-    const text = `Hi dear user,\n\n` +
+    const text = 'Hi dear user,\n\n' +
       `Your video ${video.name} has been published.` +
-      `\n\n` +
+      '\n\n' +
       `You can view it on ${videoUrl} ` +
-      `\n\n` +
-      `Cheers,\n` +
+      '\n\n' +
+      'Cheers,\n' +
       `${CONFIG.EMAIL.BODY.SIGNATURE}`
 
     const emailPayload: EmailPayload = {
@@ -167,12 +191,12 @@ class Emailer {
   myVideoImportSuccessNotification (to: string[], videoImport: MVideoImportVideo) {
     const videoUrl = WEBSERVER.URL + videoImport.Video.getWatchStaticPath()
 
-    const text = `Hi dear user,\n\n` +
+    const text = 'Hi dear user,\n\n' +
       `Your video import ${videoImport.getTargetIdentifier()} is finished.` +
-      `\n\n` +
+      '\n\n' +
       `You can view the imported video on ${videoUrl} ` +
-      `\n\n` +
-      `Cheers,\n` +
+      '\n\n' +
+      'Cheers,\n' +
       `${CONFIG.EMAIL.BODY.SIGNATURE}`
 
     const emailPayload: EmailPayload = {
@@ -187,12 +211,12 @@ class Emailer {
   myVideoImportErrorNotification (to: string[], videoImport: MVideoImport) {
     const importUrl = WEBSERVER.URL + '/my-account/video-imports'
 
-    const text = `Hi dear user,\n\n` +
+    const text = 'Hi dear user,\n\n' +
       `Your video import ${videoImport.getTargetIdentifier()} encountered an error.` +
-      `\n\n` +
+      '\n\n' +
       `See your videos import dashboard for more information: ${importUrl}` +
-      `\n\n` +
-      `Cheers,\n` +
+      '\n\n' +
+      'Cheers,\n' +
       `${CONFIG.EMAIL.BODY.SIGNATURE}`
 
     const emailPayload: EmailPayload = {
@@ -209,12 +233,12 @@ class Emailer {
     const video = comment.Video
     const commentUrl = WEBSERVER.URL + comment.getCommentStaticPath()
 
-    const text = `Hi dear user,\n\n` +
+    const text = 'Hi dear user,\n\n' +
       `A new comment has been posted by ${accountName} on your video ${video.name}` +
-      `\n\n` +
+      '\n\n' +
       `You can view it on ${commentUrl} ` +
-      `\n\n` +
-      `Cheers,\n` +
+      '\n\n' +
+      'Cheers,\n' +
       `${CONFIG.EMAIL.BODY.SIGNATURE}`
 
     const emailPayload: EmailPayload = {
@@ -231,12 +255,12 @@ class Emailer {
     const video = comment.Video
     const commentUrl = WEBSERVER.URL + comment.getCommentStaticPath()
 
-    const text = `Hi dear user,\n\n` +
+    const text = 'Hi dear user,\n\n' +
       `${accountName} mentioned you on video ${video.name}` +
-      `\n\n` +
+      '\n\n' +
       `You can view the comment on ${commentUrl} ` +
-      `\n\n` +
-      `Cheers,\n` +
+      '\n\n' +
+      'Cheers,\n' +
       `${CONFIG.EMAIL.BODY.SIGNATURE}`
 
     const emailPayload: EmailPayload = {
@@ -251,9 +275,9 @@ class Emailer {
   addVideoAbuseModeratorsNotification (to: string[], videoAbuse: MVideoAbuseVideo) {
     const videoUrl = WEBSERVER.URL + videoAbuse.Video.getWatchStaticPath()
 
-    const text = `Hi,\n\n` +
+    const text = 'Hi,\n\n' +
       `${WEBSERVER.HOST} received an abuse for the following video ${videoUrl}\n\n` +
-      `Cheers,\n` +
+      'Cheers,\n' +
       `${CONFIG.EMAIL.BODY.SIGNATURE}`
 
     const emailPayload: EmailPayload = {
@@ -265,18 +289,18 @@ class Emailer {
     return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
   }
 
-  addVideoAutoBlacklistModeratorsNotification (to: string[], video: MVideo) {
+  addVideoAutoBlacklistModeratorsNotification (to: string[], videoBlacklist: MVideoBlacklistLightVideo) {
     const VIDEO_AUTO_BLACKLIST_URL = WEBSERVER.URL + '/admin/moderation/video-auto-blacklist/list'
-    const videoUrl = WEBSERVER.URL + video.getWatchStaticPath()
+    const videoUrl = WEBSERVER.URL + videoBlacklist.Video.getWatchStaticPath()
 
-    const text = `Hi,\n\n` +
-      `A recently added video was auto-blacklisted and requires moderator review before publishing.` +
-      `\n\n` +
+    const text = 'Hi,\n\n' +
+      'A recently added video was auto-blacklisted and requires moderator review before publishing.' +
+      '\n\n' +
       `You can view it and take appropriate action on ${videoUrl}` +
-      `\n\n` +
+      '\n\n' +
       `A full list of auto-blacklisted videos can be reviewed here: ${VIDEO_AUTO_BLACKLIST_URL}` +
-      `\n\n` +
-      `Cheers,\n` +
+      '\n\n' +
+      'Cheers,\n' +
       `${CONFIG.EMAIL.BODY.SIGNATURE}`
 
     const emailPayload: EmailPayload = {
@@ -289,9 +313,9 @@ class Emailer {
   }
 
   addNewUserRegistrationNotification (to: string[], user: MUser) {
-    const text = `Hi,\n\n` +
+    const text = 'Hi,\n\n' +
       `User ${user.username} just registered on ${WEBSERVER.HOST} PeerTube instance.\n\n` +
-      `Cheers,\n` +
+      'Cheers,\n' +
       `${CONFIG.EMAIL.BODY.SIGNATURE}`
 
     const emailPayload: EmailPayload = {
@@ -344,11 +368,11 @@ class Emailer {
   }
 
   addPasswordResetEmailJob (to: string, resetPasswordUrl: string) {
-    const text = `Hi dear user,\n\n` +
+    const text = 'Hi dear user,\n\n' +
       `A reset password procedure for your account ${to} has been requested on ${WEBSERVER.HOST} ` +
-      `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` +
+      `Please follow this link to reset it: ${resetPasswordUrl}  (the link will expire within 1 hour)\n\n` +
+      'If you are not the person who initiated this request, please ignore this email.\n\n' +
+      'Cheers,\n' +
       `${CONFIG.EMAIL.BODY.SIGNATURE}`
 
     const emailPayload: EmailPayload = {
@@ -360,12 +384,28 @@ class Emailer {
     return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
   }
 
+  addPasswordCreateEmailJob (username: string, to: string, resetPasswordUrl: string) {
+    const text = 'Hi,\n\n' +
+      `Welcome to your ${WEBSERVER.HOST} PeerTube instance. Your username is: ${username}.\n\n` +
+      `Please set your password by following this link: ${resetPasswordUrl} (this link will expire within seven days).\n\n` +
+      'Cheers,\n' +
+      `${CONFIG.EMAIL.BODY.SIGNATURE}`
+
+    const emailPayload: EmailPayload = {
+      to: [ to ],
+      subject: CONFIG.EMAIL.SUBJECT.PREFIX + 'New PeerTube account password',
+      text
+    }
+
+    return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
+  }
+
   addVerifyEmailJob (to: string, verifyEmailUrl: string) {
-    const text = `Welcome to PeerTube,\n\n` +
+    const text = 'Welcome to PeerTube,\n\n' +
       `To start using PeerTube on ${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` +
+      'If you are not the person who initiated this request, please ignore this email.\n\n' +
+      'Cheers,\n' +
       `${CONFIG.EMAIL.BODY.SIGNATURE}`
 
     const emailPayload: EmailPayload = {
@@ -418,8 +458,8 @@ class Emailer {
     return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
   }
 
-  sendMail (options: EmailPayload) {
-    if (!Emailer.isEnabled()) {
+  async sendMail (options: EmailPayload) {
+    if (!isEmailEnabled()) {
       throw new Error('Cannot send mail because SMTP is not configured.')
     }
 
@@ -427,13 +467,15 @@ class Emailer {
       ? options.fromDisplayName
       : WEBSERVER.HOST
 
-    return this.transporter.sendMail({
-      from: `"${fromDisplayName}" <${CONFIG.SMTP.FROM_ADDRESS}>`,
-      replyTo: options.replyTo,
-      to: options.to.join(','),
-      subject: options.subject,
-      text: options.text
-    })
+    for (const to of options.to) {
+      await this.transporter.sendMail({
+        from: `"${fromDisplayName}" <${CONFIG.SMTP.FROM_ADDRESS}>`,
+        replyTo: options.replyTo,
+        to,
+        subject: options.subject,
+        text: options.text
+      })
+    }
   }
 
   private dieOnConnectionFailure (err?: Error) {