twikoo-func 1.6.35 → 1.6.36

package/index.js

@@ -10,6 +10,7 @@ const {
   getCheerio,
   getDomPurify,
   getMd5,
+  getSha256,
   getXml2js
 } = require('./utils/lib')
 const {
@@ -53,6 +54,7 @@ const _ = db.command
 const $ = getCheerio()
 const DOMPurify = getDomPurify()
 const md5 = getMd5()
+const sha256 = getSha256()
 const xml2js = getXml2js()
 
 // 常量 / constants
@@ -624,7 +626,7 @@ async function parse (comment) {
     uid: await getUid(),
     nick: comment.nick ? comment.nick : '匿名',
     mail: comment.mail ? comment.mail : '',
-    mailMd5: comment.mail ? md5(normalizeMail(comment.mail)) : '',
+    mailMd5: comment.mail ? sha256(normalizeMail(comment.mail)) : '',
     link: comment.link ? comment.link : '',
     ua: comment.ua,
     ip: auth.getClientIP(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twikoo-func",
-  "version": "1.6.35",
+  "version": "1.6.36",
   "description": "A simple comment system.",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",

package/utils/index.js

@@ -4,12 +4,14 @@ const {
   getFormData,
   getBowser,
   getIpToRegion,
-  getMd5
+  getMd5,
+  getSha256
 } = require('./lib')
 const axios = getAxios()
 const FormData = getFormData()
 const bowser = getBowser()
 const md5 = getMd5()
+const sha256 = getSha256()
 const { RES_CODE } = require('./constants')
 const logger = require('./logger')
 
@@ -183,14 +185,23 @@ const fn = {
     }
     return md5(comment.nick)
   },
+  getMailSha256 (comment) {
+    if (comment.mail) {
+      return sha256(fn.normalizeMail(comment.mail))
+    }
+    return sha256(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 = fn.getMailMd5(comment)
-      return `https://${gravatarCdn}/avatar/${mailMd5}?d=${defaultGravatar}`
+      const gravatarCdn = config.GRAVATAR_CDN || 'weavatar.com'
+      let defaultGravatar = gravatarCdn === 'weavatar.com' ? `letter&letter=${comment.nick.charAt(0)}` : 'identicon'
+      if (config.DEFAULT_GRAVATAR) {
+        defaultGravatar = config.DEFAULT_GRAVATAR
+      }
+      const mailHash = gravatarCdn === 'cravatar.cn' ? fn.getMailMd5(comment) : fn.getMailSha256(comment) // Cravatar 不支持 sha256
+      return `https://${gravatarCdn}/avatar/${mailHash}?d=${defaultGravatar}`
     }
   },
   isUrl (s) {
@@ -296,6 +307,7 @@ const fn = {
         HIDE_ADMIN_CRYPT: config.HIDE_ADMIN_CRYPT,
         HIGHLIGHT: config.HIGHLIGHT || 'true',
         HIGHLIGHT_THEME: config.HIGHLIGHT_THEME,
+        HIGHLIGHT_PLUGIN: config.HIGHLIGHT_PLUGIN,
         LIMIT_LENGTH: config.LIMIT_LENGTH,
         TURNSTILE_SITE_KEY: config.TURNSTILE_SITE_KEY
       }

package/utils/lib.js

@@ -46,9 +46,15 @@ module.exports = {
     return marked
   },
   getMd5 () {
-    const md5 = require('blueimp-md5') // MD5 加解密
+    const md5 = require('blueimp-md5') // MD5 哈希
     return md5
   },
+  getSha256 () {
+    const { SHA256 } = require('crypto-js') // SHA256 哈希
+    return (message) => {
+      return SHA256(message).toString()
+    }
+  },
   getNodemailer () {
     if (customLibs.nodemailer) return customLibs.nodemailer
     const nodemailer = require('nodemailer') // 发送邮件