@waline/vercel 1.17.1 → 1.17.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.17.1",
+  "version": "1.17.4",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -31,7 +31,7 @@
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
     "mathjax-full": "^3.2.0",
-    "nodemailer": "^6.7.4",
+    "nodemailer": "^6.7.5",
     "nunjucks": "^3.2.3",
     "phpass": "^0.1.1",
     "prismjs": "^1.28.0",

package/src/controller/comment.js

@@ -365,7 +365,7 @@ module.exports = class extends BaseRest {
           });
           comments.forEach((cmt) => {
             const countItem = (counts || []).find(({ mail, user_id }) => {
-              if (user_id) {
+              if (cmt.user_id) {
                 return user_id === cmt.user_id;
               }
               return mail === cmt.mail;

package/src/controller/token.js

@@ -47,13 +47,18 @@ module.exports = class extends BaseRest {
       }
     }
 
-    let avatar = user[0].avatar;
-    if (/(github)/i.test(avatar)) {
-      avatar =
-        this.config('avatarProxy') + '?url=' + encodeURIComponent(avatar);
+    let avatarUrl = user[0].avatar
+      ? user[0].avatar
+      : await think.service('avatar').stringify({
+          mail: user[0].email,
+          nick: user[0].display_name,
+          link: user[0].url,
+        });
+    const { avatarProxy } = think.config();
+    if (avatarProxy) {
+      avatarUrl = avatarProxy + '?url=' + encodeURIComponent(avatarUrl);
     }
-    user[0].avatar = avatar;
-
+    user[0].avatar = avatarUrl;
     return this.success({
       ...user[0],
       password: null,

package/src/extend/think.js

@@ -59,7 +59,11 @@ module.exports = {
 
     try {
       const search = helper.promisify(regionSearch.btreeSearch, regionSearch);
-      const { region } = await search(ip);
+      const result = await search(ip);
+      if (!result) {
+        return '';
+      }
+      const { region } = result;
       const [, , province, city, isp] = region.split('|');
       const address = Array.from(new Set([province, city, isp]));
       return address.slice(0, depth).join(' ');

package/src/logic/base.js

@@ -65,6 +65,7 @@ module.exports = class extends think.Logic {
           'qq',
           'avatar',
           '2fa',
+          'label',
         ],
       }
     );

package/src/service/storage/github.js

@@ -30,6 +30,7 @@ const CSV_HEADERS = {
     'type',
     'url',
     'avatar',
+    'label',
     'github',
     'twitter',
     'facebook',

package/src/service/storage/leancloud.js

@@ -127,7 +127,11 @@ module.exports = class extends Base {
   }
 
   async _getCmtGroupByMailUserIdCache(key, where) {
-    if (this.tableName !== 'Comment' || key !== 'user_id_mail') {
+    if (
+      this.tableName !== 'Comment' ||
+      key !== 'user_id_mail' ||
+      !think.isArray(think.config('levels'))
+    ) {
       return [];
     }
 
@@ -140,7 +144,11 @@ module.exports = class extends Base {
   }
 
   async _setCmtGroupByMailUserIdCache(key, data) {
-    if (this.tableName !== 'Comment' || key !== 'user_id_mail') {
+    if (
+      this.tableName !== 'Comment' ||
+      key !== 'user_id_mail' ||
+      !think.isArray(think.config('levels'))
+    ) {
       return;
     }
 
@@ -161,7 +169,10 @@ module.exports = class extends Base {
   }
 
   async _updateCmtGroupByMailUserIdCache(data, method) {
-    if (this.tableName !== 'Comment') {
+    if (
+      this.tableName !== 'Comment' ||
+      !think.isArray(think.config('levels'))
+    ) {
       return;
     }
 
@@ -204,7 +215,14 @@ module.exports = class extends Base {
 
     const currentTableName = this.tableName;
     this.tableName = cacheTableName;
-    await this.update({ count }, { objectId: cacheData[0].objectId });
+    await this.update({ count }, { objectId: cacheData[0].objectId }).catch(
+      (e) => {
+        if (e.code === 101) {
+          return;
+        }
+        throw e;
+      }
+    );
     this.tableName = currentTableName;
   }
 
@@ -227,7 +245,7 @@ module.exports = class extends Base {
     const cacheDataMap = {};
     for (let i = 0; i < cacheData.length; i++) {
       const key = options.group
-        .map((item) => cacheData[i][item] || null)
+        .map((item) => cacheData[i][item] || undefined)
         .join('_');
       cacheDataMap[key] = cacheData[i];
     }
@@ -242,7 +260,7 @@ module.exports = class extends Base {
 
       const groupFlatValue = {};
       options.group.slice(0, i).forEach((group) => {
-        groupFlatValue[group] = null;
+        groupFlatValue[group] = undefined;
       });
 
       for (let j = 0; j < where._complex[groupName][1].length; j++) {
@@ -252,7 +270,7 @@ module.exports = class extends Base {
               ({
                 ...groupFlatValue,
                 [groupName]: where._complex[groupName][1][j],
-              }[item] || null)
+              }[item] || undefined)
           )
           .join('_');
         if (cacheDataMap[cacheKey]) {