fix(vercel): add sender_email env to custom mail from fix #120

walinejs · Jan 4, 2021 · e5e9af8 · e5e9af8
1 parent 8ad1fde
commit e5e9af8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@waline/vercel",
   "description": "vercel server for waline comment system",
-  "version": "0.20.3",
+  "version": "0.20.4",
   "author": "lizheming <i@imnerd.org>",
   "scripts": {
     "lint": "eslint src/",

diff --git a/packages/server/src/service/notify.js b/packages/server/src/service/notify.js
@@ -30,7 +30,7 @@ module.exports = class extends think.Service {
       return;
     }
 
-    const {SITE_NAME, SITE_URL, SMTP_USER} = process.env;
+    const {SITE_NAME, SITE_URL, SMTP_USER, SENDER_EMAIL, SENDER_NAME} = process.env;
     const data = {
       self, 
       parent, 
@@ -44,7 +44,7 @@ module.exports = class extends think.Service {
     content = nunjucks.renderString(content, data);
 
     return this.transporter.sendMail({
-      from: SMTP_USER,
+      from: SENDER_EMAIL && SENDER_NAME ? `"${SENDER_NAME}" <${SENDER_EMAIL}>` : SMTP_USER,
       to, 
       subject: title, 
       html: content