add getMailMd5, use hash of nick if no mail (#484)

twikoojs · Nov 23, 2022 · 05cd75f · 05cd75f
1 parent 5af1473
commit 05cd75f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/src/server/function/twikoo/index.js b/src/server/function/twikoo/index.js
@@ -19,6 +19,7 @@ const {
   getUrlsQuery,
   parseComment,
   parseCommentForAdmin,
+  getMailMd5,
   getAvatar,
   isQQ,
   addQQMailSuffix,
@@ -778,7 +779,7 @@ async function getRecentComments (event) {
         href: comment.href,
         nick: comment.nick,
         avatar: getAvatar(comment, config),
-        mailMd5: comment.mailMd5 || md5(comment.mail),
+        mailMd5: getMailMd5(comment),
         link: comment.link,
         comment: comment.comment,
         commentText: $(comment.comment).text(),

diff --git a/src/server/function/twikoo/utils/index.js b/src/server/function/twikoo/utils/index.js
@@ -55,7 +55,7 @@ const fn = {
       id: comment._id.toString(),
       nick: comment.nick,
       avatar: comment.avatar,
-      mailMd5: comment.mailMd5 || md5(comment.mail),
+      mailMd5: fn.getMailMd5(comment),
       link: comment.link,
       comment: comment.comment,
       os: displayOs,
@@ -116,13 +116,22 @@ const fn = {
     }
     return url.substring(x)
   },
+  getMailMd5 (comment) {
+    if (comment.mailMd5) {
+      return comment.mailMd5
+    }
+    if (comment.mail) {
+      return md5(comment.mail)
+    }
+    return md5(comment.nick)
+  },
   getAvatar (comment, config) {
     if (comment.avatar) {
       return comment.avatar
     } else {
       const gravatarCdn = config.GRAVATAR_CDN || 'cravatar.cn'
       const defaultGravatar = config.DEFAULT_GRAVATAR || 'identicon'
-      const mailMd5 = comment.mailMd5 || md5(comment.mail)
+      const mailMd5 = fn.getMailMd5(comment)
       return `https://${gravatarCdn}/avatar/${mailMd5}?d=${defaultGravatar}`
     }
   },

diff --git a/src/server/self-hosted/index.js b/src/server/self-hosted/index.js
@@ -23,6 +23,7 @@ const {
   getUrlsQuery,
   parseComment,
   parseCommentForAdmin,
+  getMailMd5,
   getAvatar,
   isQQ,
   addQQMailSuffix,
@@ -789,7 +790,7 @@ async function getRecentComments (event) {
         url: comment.url,
         nick: comment.nick,
         avatar: getAvatar(comment, config),
-        mailMd5: comment.mailMd5 || md5(comment.mail),
+        mailMd5: getMailMd5(comment),
         link: comment.link,
         comment: comment.comment,
         commentText: $(comment.comment).text(),

diff --git a/src/server/vercel/api/index.js b/src/server/vercel/api/index.js
@@ -22,6 +22,7 @@ const {
   getUrlsQuery,
   parseComment,
   parseCommentForAdmin,
+  getMailMd5,
   getAvatar,
   isQQ,
   addQQMailSuffix,
@@ -803,7 +804,7 @@ async function getRecentComments (event) {
         url: comment.url,
         nick: comment.nick,
         avatar: getAvatar(comment, config),
-        mailMd5: comment.mailMd5 || md5(comment.mail),
+        mailMd5: getMailMd5(comment),
         link: comment.link,
         comment: comment.comment,
         commentText: $(comment.comment).text(),