feat: add avatarUrl to custom avatar url fix #607

walinejs · Oct 30, 2021 · a473ecb · a473ecb
1 parent 6296fe5
commit a473ecb
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/packages/server/src/controller/comment.js b/packages/server/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;
 }
 

diff --git a/packages/server/src/logic/base.js b/packages/server/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;
   }
 };
diff --git a/packages/server/src/service/avatar.js b/packages/server/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);
+  }
+};