@waline/vercel 1.2.2 → 1.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.2.2",
+  "version": "1.2.6",
   "description": "vercel server for waline comment system",
   "repository": "https://github.com/walinejs/waline",
   "license": "MIT",
@@ -12,16 +12,16 @@
     "deta": "^1.0.1",
     "dompurify": "^2.3.3",
     "fast-csv": "^4.3.6",
-    "jsdom": "^17.0.0",
+    "jsdom": "^18.0.0",
     "jsonwebtoken": "^8.5.1",
-    "katex": "^0.13.18",
+    "katex": "^0.13.23",
     "leancloud-storage": "^4.12.0",
     "markdown-it": "^12.2.0",
     "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.6.5",
+    "nodemailer": "^6.7.0",
     "nunjucks": "^3.2.3",
     "phpass": "^0.1.1",
     "prismjs": "^1.25.0",
@@ -35,6 +35,6 @@
     "think-mongo": "^2.1.2",
     "think-router-rest": "^1.0.5",
     "thinkjs": "^3.2.14",
-    "ua-parser-js": "^0.7.28"
+    "ua-parser-js": "^0.7.31"
   }
 }

package/src/controller/comment.js

@@ -19,27 +19,26 @@ async function formatCmt(
   }
 
   const user = users.find(({ objectId }) => user_id === objectId);
-  if (user) {
+  if (!think.isEmpty(user)) {
     comment.nick = user.display_name;
     comment.mail = user.email;
     comment.link = user.url;
     comment.type = user.type;
   }
 
-  comment.mail = helper.md5(
-    comment.mail ? comment.mail.toLowerCase() : comment.mail
-  );
-
   const avatarUrl =
     user && user.avatar
       ? user.avatar
-      : `https://seccdn.libravatar.org/avatar/${comment.mail}`;
-
+      : await think.service('avatar').stringify(comment);
   comment.avatar =
     avatarProxy && !avatarUrl.includes(avatarProxy)
       ? avatarProxy + '?url=' + encodeURIComponent(avatarUrl)
       : avatarUrl;
 
+  comment.mail = helper.md5(
+    comment.mail ? comment.mail.toLowerCase() : comment.mail
+  );
+
   return comment;
 }
 
@@ -71,6 +70,7 @@ module.exports = class extends BaseRest {
               'link',
               'mail',
               'nick',
+              'url',
               'pid',
               'rid',
               'ua',
@@ -257,7 +257,7 @@ module.exports = class extends BaseRest {
     if (pid) {
       data.comment = data.comment.replace(
         '<p>',
-        `<p><a class="at" href="#${pid}">@${at}</a> , `
+        `<p><a class="at" href="#${pid}">@${at}</a>: `
       );
     }
 

package/src/controller/index.js

@@ -22,6 +22,7 @@ module.exports = class extends think.Controller {
         const waline = new Waline({
           el: '#waline',
           path: '/',
+          lang: new URLSearchParams(location.search.slice(1)).get('lng'),
           serverURL: location.protocol + '//' + location.host + location.pathname.replace(/\\/+$/, '')
         });
       </script>

package/src/logic/base.js

@@ -50,16 +50,20 @@ module.exports = class extends think.Logic {
     }
 
     const userInfo = user[0];
-    userInfo.mailMd5 = helper.md5(userInfo.email);
 
     let avatarUrl = userInfo.avatar
       ? userInfo.avatar
-      : `https://seccdn.libravatar.org/avatar/${userInfo.mailMd5}`;
+      : await think.service('avatar').stringify({
+          mail: userInfo.email,
+          nick: userInfo.display_name,
+          link: userInfo.url,
+        });
     const { avatarProxy } = think.config();
     if (avatarProxy) {
       avatarUrl = avatarProxy + '?url=' + encodeURIComponent(avatarUrl);
     }
     userInfo.avatar = avatarUrl;
+    userInfo.mailMd5 = helper.md5(userInfo.email);
     this.ctx.state.userInfo = userInfo;
   }
 };

package/src/service/avatar.js

@@ -0,0 +1,22 @@
+const nunjucks = require('nunjucks');
+const helper = require('think-helper');
+const { GRAVATAR_STR } = process.env;
+
+const env = new nunjucks.Environment();
+env.addFilter('md5', (str) => helper.md5(str));
+
+module.exports = class extends think.Service {
+  async stringify(comment) {
+    const fn = think.config('avatarUrl');
+    if (think.isFunction(fn)) {
+      const ret = await fn(comment);
+      if (think.isString(ret) && ret) {
+        return ret;
+      }
+    }
+
+    const gravatarStr =
+      GRAVATAR_STR || 'https://seccdn.libravatar.org/avatar/{{mail|md5}}';
+    return env.renderString(gravatarStr, comment);
+  }
+};