@waline/vercel 1.2.0 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.2.0",
+  "version": "1.2.4",
   "description": "vercel server for waline comment system",
   "repository": "https://github.com/walinejs/waline",
   "license": "MIT",
@@ -9,6 +9,7 @@
     "@cloudbase/node-sdk": "^2.7.1",
     "@koa/cors": "^3.1.0",
     "akismet": "^2.0.6",
+    "deta": "^1.0.1",
     "dompurify": "^2.3.3",
     "fast-csv": "^4.3.6",
     "jsdom": "^17.0.0",

package/src/controller/comment.js

@@ -26,20 +26,19 @@ async function formatCmt(
     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',

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);
+  }
+};

package/src/service/storage/deta.js

@@ -161,7 +161,7 @@ module.exports = class extends Base {
       const { items } = await this.instance.fetch(conditions, {
         limit: limit,
       });
-      data = items;
+      data = items || [];
     }
 
     data = data.map(({ key, ...cmt }) => ({