@waline/vercel 1.7.0 → 1.8.0

package/README.md

@@ -1,6 +1,6 @@
-## @waline/vercel
+# @waline/vercel
 
-![](https://img.shields.io/npm/v/@waline/vercel?color=blue&logo=npm&style=flat-square)
+![Version](https://img.shields.io/npm/v/@waline/vercel?color=blue&logo=npm&style=flat-square)
 
 This is the backend for Waline comment system.
 
@@ -20,6 +20,6 @@ We support [Akismet](https://akismet.com/) spam protection service default. If y
 
 ## Deploy
 
-[ ![](https://vercel.com/button) ](https://vercel.com/import/project?template=https://github.com/walinejs/waline/tree/main/example)
+[![Deploy button](https://vercel.com/button)](https://vercel.com/import/project?template=https://github.com/walinejs/waline/tree/main/example)
 
 Click it to deploy quickly!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "vercel server for waline comment system",
   "repository": "https://github.com/walinejs/waline",
   "license": "MIT",
@@ -10,25 +10,25 @@
     "@cloudbase/node-sdk": "^2.7.1",
     "@koa/cors": "^3.1.0",
     "akismet": "^2.0.6",
-    "deta": "^1.0.1",
-    "dompurify": "^2.3.3",
+    "deta": "^1.0.2",
+    "dompurify": "^2.3.6",
     "fast-csv": "^4.3.6",
-    "jsdom": "^18.0.0",
+    "jsdom": "^19.0.0",
     "jsonwebtoken": "^8.5.1",
-    "katex": "^0.13.23",
-    "leancloud-storage": "^4.12.0",
+    "katex": "^0.15.2",
+    "leancloud-storage": "^4.12.2",
     "markdown-it": "^12.3.2",
     "markdown-it-emoji": "^2.0.0",
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
     "mathjax-full": "^3.2.0",
-    "nodemailer": "^6.7.0",
+    "nodemailer": "^6.7.2",
     "nunjucks": "^3.2.3",
     "phpass": "^0.1.1",
-    "prismjs": "^1.25.0",
+    "prismjs": "^1.27.0",
     "request": "^2.88.2",
     "request-promise-native": "^1.0.9",
-    "think-logger3": "^1.2.1",
+    "think-logger3": "^1.3.1",
     "think-model": "^1.5.4",
     "think-model-mysql": "^1.1.6",
     "think-model-postgresql": "^1.1.6",
@@ -36,6 +36,6 @@
     "think-mongo": "^2.1.2",
     "think-router-rest": "^1.0.5",
     "thinkjs": "^3.2.14",
-    "ua-parser-js": "^0.7.31"
+    "ua-parser-js": "^1.0.2"
   }
 }

package/src/config/adapter.js

@@ -37,10 +37,9 @@ const {
 } = process.env;
 
 let type = 'common';
-let mongoOpt = {
-  replicaSet: MONGO_REPLICASET,
-  authSource: MONGO_AUTHSOURCE,
-};
+const mongoOpt = {};
+if (MONGO_REPLICASET) mongoOpt.replicaSet = MONGO_REPLICASET;
+if (MONGO_AUTHSOURCE) mongoOpt.authSource = MONGO_AUTHSOURCE;
 
 if (MONGO_DB) {
   type = 'mongo';

package/src/service/markdown/xss.js

@@ -28,10 +28,16 @@ DOMPurify.addHook('afterSanitizeAttributes', function (node) {
 });
 
 const sanitize = (content) =>
-  DOMPurify.sanitize(content, {
-    FORBID_TAGS: ['form', 'input', 'style'],
-    FORBID_ATTR: ['autoplay', 'style'],
-  });
+  DOMPurify.sanitize(
+    content,
+    Object.assign(
+      {
+        FORBID_TAGS: ['form', 'input', 'style'],
+        FORBID_ATTR: ['autoplay', 'style'],
+      },
+      think.config('domPurify') || {}
+    )
+  );
 
 module.exports = {
   sanitize,

package/src/service/notify.js

@@ -273,6 +273,50 @@ module.exports = class extends think.Service {
     });
   }
 
+  async pushplus({ title, content }, self, parent) {
+    const {
+      PUSH_PLUS_KEY,
+      PUSH_PLUS_TOPIC: topic,
+      PUSH_PLUS_TEMPLATE: template,
+      PUSH_PLUS_CHANNEL: channel,
+      PUSH_PLUS_WEBHOOK: webhook,
+      PUSH_PLUS_CALLBACKURL: callbackUrl,
+      SITE_NAME,
+      SITE_URL,
+    } = process.env;
+
+    if (!PUSH_PLUS_KEY) {
+      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(content, data);
+
+    return request({
+      uri: `http://www.pushplus.plus/send/${PUSH_PLUS_KEY}`,
+      method: 'POST',
+      form: {
+        title,
+        content,
+        topic,
+        template,
+        channel,
+        webhook,
+        callbackUrl,
+      },
+      json: true,
+    });
+  }
+
   async run(comment, parent, disableAuthorNotify = false) {
     const { AUTHOR_EMAIL, BLOGGER_EMAIL } = process.env;
     const { mailSubject, mailTemplate, mailSubjectAdmin, mailTemplateAdmin } =
@@ -312,11 +356,10 @@ 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);
       if (
-        think.isEmpty(wechat) &&
-        think.isEmpty(qq) &&
-        think.isEmpty(telegram) &&
-        think.isEmpty(qywxAmWechat) &&
+        [wechat, qq, telegram, qywxAmWechat, pushplus].every(think.isEmpty) &&
         !isReplyAuthor
       ) {
         mailList.push({ to: AUTHOR, title, content });