Add import.video.torrent configuration

[oweals/peertube.git] / server / lib / emailer.ts

diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index 85cc725fa9991b2e58c54a98362f91f65ffa5f7c..ded321bf70c4acd186c0225779a10810d7af5d56 100644 (file)
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -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.`
@@ -89,9 +91,10 @@ class Emailer {
 
   async addVideoAbuseReport (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.`