@waline/vercel 1.8.0 → 1.8.1

package/package.json

@@ -1,28 +1,28 @@
 {
   "name": "@waline/vercel",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "vercel server for waline comment system",
   "repository": "https://github.com/walinejs/waline",
   "license": "MIT",
   "author": "lizheming <i@imnerd.org>",
   "dependencies": {
     "@byteinspire/api": "^1.0.12",
-    "@cloudbase/node-sdk": "^2.7.1",
-    "@koa/cors": "^3.1.0",
+    "@cloudbase/node-sdk": "^2.9.0",
+    "@koa/cors": "^3.2.0",
     "akismet": "^2.0.6",
-    "deta": "^1.0.2",
+    "deta": "^1.1.0",
     "dompurify": "^2.3.6",
     "fast-csv": "^4.3.6",
     "jsdom": "^19.0.0",
     "jsonwebtoken": "^8.5.1",
-    "katex": "^0.15.2",
+    "katex": "^0.15.3",
     "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.2",
+    "nodemailer": "^6.7.3",
     "nunjucks": "^3.2.3",
     "phpass": "^0.1.1",
     "prismjs": "^1.27.0",
@@ -30,7 +30,7 @@
     "request-promise-native": "^1.0.9",
     "think-logger3": "^1.3.1",
     "think-model": "^1.5.4",
-    "think-model-mysql": "^1.1.6",
+    "think-model-mysql": "^1.1.7",
     "think-model-postgresql": "^1.1.6",
     "think-model-sqlite": "^1.2.2",
     "think-mongo": "^2.1.2",

package/src/controller/comment.js

@@ -441,7 +441,12 @@ module.exports = class extends BaseRest {
 
   async putAction() {
     const data = this.post();
-    const oldData = await this.modelInstance.select({ objectId: this.id });
+    let oldData = await this.modelInstance.select({ objectId: this.id });
+    if (think.isEmpty(oldData)) {
+      return this.success();
+    }
+
+    oldData = oldData[0];
     const preUpdateResp = await this.hook('preUpdate', {
       ...data,
       objectId: this.id,
@@ -451,18 +456,22 @@ module.exports = class extends BaseRest {
       return this.fail(preUpdateResp);
     }
 
-    await this.modelInstance.update(data, { objectId: this.id });
+    const newData = await this.modelInstance.update(data, {
+      objectId: this.id,
+    });
 
     if (
       oldData.status === 'waiting' &&
       data.status === 'approved' &&
       oldData.pid
     ) {
-      let pComment = await this.modelInstance.select({ objectId: oldData.pid });
+      let pComment = await this.modelInstance.select({
+        objectId: oldData.pid,
+      });
       pComment = pComment[0];
 
       const notify = this.service('notify');
-      await notify.run(oldData, pComment, true);
+      await notify.run(newData, pComment, true);
     }
 
     await this.hook('postUpdate', data);

package/src/controller/index.js

@@ -19,10 +19,11 @@ module.exports = class extends think.Controller {
           'color: white; background: #0078E7; padding:5px 0;',
           'padding:4px;border:1px solid #0078E7;'
         );
+        const params = new URLSearchParams(location.search.slice(1));
         const waline = new Waline({
           el: '#waline',
-          path: '/',
-          lang: new URLSearchParams(location.search.slice(1)).get('lng'),
+          path: params.get('path') || '/',
+          lang: params.get('lng'),
           serverURL: location.protocol + '//' + location.host + location.pathname.replace(/\\/+$/, '')
         });
       </script>

package/src/service/avatar.js

@@ -5,6 +5,15 @@ const { GRAVATAR_STR } = process.env;
 const env = new nunjucks.Environment();
 env.addFilter('md5', (str) => helper.md5(str));
 
+const DEFAULT_GRAVATAR_STR = `{%- set numExp = r/^[0-9]+$/g -%}
+{%- set qqMailExp = r/^[0-9]+@qq.com$/ig -%}
+{%- if numExp.test(nick) -%}
+  https://q1.qlogo.cn/g?b=qq&nk={{nick}}&s=100
+{%- elif qqMailExp.test(mail) -%}
+  https://q1.qlogo.cn/g?b=qq&nk={{mail|replace('@qq.com', '')}}&s=100
+{%- else -%}
+  https://seccdn.libravatar.org/avatar/{{mail|md5}}
+{%- endif -%}`;
 module.exports = class extends think.Service {
   async stringify(comment) {
     const fn = think.config('avatarUrl');
@@ -15,8 +24,7 @@ module.exports = class extends think.Service {
       }
     }
 
-    const gravatarStr =
-      GRAVATAR_STR || 'https://seccdn.libravatar.org/avatar/{{mail|md5}}';
+    const gravatarStr = GRAVATAR_STR || DEFAULT_GRAVATAR_STR;
     return env.renderString(gravatarStr, comment);
   }
 };