@waline/vercel 1.9.0 → 1.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "description": "vercel server for waline comment system",
   "repository": "https://github.com/walinejs/waline",
   "license": "MIT",

package/src/config/config.js

@@ -36,6 +36,7 @@ const {
   QQ_TEMPLATE,
   TG_TEMPLATE,
   WX_TEMPLATE,
+  DISCORD_TEMPLATE,
 } = process.env;
 
 let storage = 'leancloud';
@@ -113,4 +114,5 @@ module.exports = {
   QQTemplate: QQ_TEMPLATE,
   TGTemplate: TG_TEMPLATE,
   WXTemplate: WX_TEMPLATE,
+  DiscordTemplate: DISCORD_TEMPLATE,
 };

package/src/controller/user.js

@@ -78,7 +78,7 @@ module.exports = class extends BaseRest {
   }
 
   async putAction() {
-    const { display_name, url, password } = this.post();
+    const { display_name, url, avatar, password } = this.post();
     const { objectId } = this.ctx.state.userInfo;
 
     const updateData = {};
@@ -91,6 +91,10 @@ module.exports = class extends BaseRest {
       updateData.url = url;
     }
 
+    if (avatar) {
+      updateData.avatar = avatar;
+    }
+
     if (password) {
       updateData.password = new PasswordHash().hashPassword(password);
     }

package/src/middleware/dashboard.js

@@ -13,7 +13,10 @@ module.exports = function () {
     window.SITE_URL = ${JSON.stringify(process.env.SITE_URL)};
     window.SITE_NAME = ${JSON.stringify(process.env.SITE_NAME)};
     </script>
-    <script src="https://cdn.jsdelivr.net/npm/@waline/admin"></script>
+    <script src="${
+      process.env.WALINE_ADMIN_MODULE_ASSET_URL ||
+      'https://cdn.jsdelivr.net/npm/@waline/admin'
+    }"></script>
   </body>
 </html>`;
   };

package/src/service/notify.js

@@ -317,6 +317,42 @@ module.exports = class extends think.Service {
     });
   }
 
+  async discord({ title, content }, self, parent) {
+    const { DISCORD_WEBHOOK, SITE_NAME, SITE_URL } = process.env;
+    if (!DISCORD_WEBHOOK) {
+      return false;
+    }
+
+    const data = {
+      self,
+      parent,
+      site: {
+        name: SITE_NAME,
+        url: SITE_URL,
+        postUrl: SITE_URL + self.url + '#' + self.objectId,
+      },
+    };
+    title = nunjucks.renderString(title, data);
+    content = nunjucks.renderString(
+      think.config('DiscordTemplate') ||
+        `💬 {{site.name|safe}}的文章《{{postName}}》有新评论啦 
+    【评论者昵称】：{{self.nick}}
+    【评论者邮箱】：{{self.mail}} 
+    【内容】：{{self.comment}} 
+    【地址】：{{site.postUrl}}`,
+      data
+    );
+
+    return request({
+      uri: DISCORD_WEBHOOK,
+      method: 'POST',
+      form: {
+        content: title + '\n' + content,
+      },
+      json: true,
+    });
+  }
+
   async run(comment, parent, disableAuthorNotify = false) {
     const { AUTHOR_EMAIL, BLOGGER_EMAIL } = process.env;
     const { mailSubject, mailTemplate, mailSubjectAdmin, mailTemplateAdmin } =
@@ -357,9 +393,11 @@ module.exports = class extends think.Service {
       const qq = await this.qq(comment, parent);
       const telegram = await this.telegram(comment, parent);
       const pushplus = await this.pushplus({ title, content }, comment, parent);
-      console.log(pushplus);
+      const discord = await this.discord({ title, content }, comment, parent);
       if (
-        [wechat, qq, telegram, qywxAmWechat, pushplus].every(think.isEmpty) &&
+        [wechat, qq, telegram, qywxAmWechat, pushplus, discord].every(
+          think.isEmpty
+        ) &&
         !isReplyAuthor
       ) {
         mailList.push({ to: AUTHOR, title, content });