@waline/vercel 1.23.2 → 1.23.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.23.2",
+  "version": "1.23.3",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -33,7 +33,7 @@
     "markdown-it-sup": "1.0.0",
     "mathjax-full": "3.2.2",
     "node-fetch": "2.6.7",
-    "nodemailer": "6.7.8",
+    "nodemailer": "6.8.0",
     "nunjucks": "3.2.3",
     "phpass": "0.1.1",
     "prismjs": "1.29.0",

package/src/controller/comment.js

@@ -533,8 +533,8 @@ module.exports = class extends BaseRest {
       think.logger.debug(`Comment post frequence check OK!`);
 
       /** Akismet */
-      const { COMMENT_AUDIT, AUTHOR_EMAIL, BLOGGER_EMAIL } = process.env;
-      const AUTHOR = AUTHOR_EMAIL || BLOGGER_EMAIL;
+      const { COMMENT_AUDIT, AUTHOR_EMAIL } = process.env;
+      const AUTHOR = AUTHOR_EMAIL;
       const isAuthorComment = AUTHOR
         ? data.mail.toLowerCase() === AUTHOR.toLowerCase()
         : false;

package/src/logic/article.js

@@ -21,7 +21,7 @@ module.exports = class extends Base {
         string: true,
         in: ['inc', 'desc'],
         default: 'inc',
-      }
+      },
     };
   }
 };

package/src/service/notify.js

@@ -26,7 +26,7 @@ module.exports = class extends think.Service {
       } else {
         config.host = SMTP_HOST;
         config.port = parseInt(SMTP_PORT);
-        config.secure = SMTP_SECURE !== 'false';
+        config.secure = SMTP_SECURE && SMTP_SECURE !== 'false';
       }
       this.transporter = nodemailer.createTransport(config);
     }
@@ -379,10 +379,10 @@ module.exports = class extends think.Service {
   }
 
   async run(comment, parent, disableAuthorNotify = false) {
-    const { AUTHOR_EMAIL, BLOGGER_EMAIL, DISABLE_AUTHOR_NOTIFY } = process.env;
+    const { AUTHOR_EMAIL, DISABLE_AUTHOR_NOTIFY } = process.env;
     const { mailSubject, mailTemplate, mailSubjectAdmin, mailTemplateAdmin } =
       think.config();
-    const AUTHOR = AUTHOR_EMAIL || BLOGGER_EMAIL;
+    const AUTHOR = AUTHOR_EMAIL;
 
     const mailList = [];
     const isAuthorComment = AUTHOR

package/src/service/storage/deta.js

@@ -47,7 +47,7 @@ module.exports = class extends Base {
     return (lastKey - Math.round(Math.random() * 100)).toString();
   }
 
-  where(where) {
+  parseWhere(where) {
     if (think.isEmpty(where)) {
       return;
     }
@@ -122,6 +122,29 @@ module.exports = class extends Base {
     return this.complex(conditions, _isArrayKeys);
   }
 
+  where(where) {
+    const filter = this.parseWhere(where);
+
+    if (!where._complex) {
+      return filter;
+    }
+
+    const filters = [];
+
+    for (const k in where._complex) {
+      if (k === '_logic') {
+        continue;
+      }
+      filters.push({
+        ...this.parseWhere({ [k]: where._complex[k] }),
+        ...filter,
+      });
+    }
+
+    // just support OR logic for deta
+    return filters;
+  }
+
   async select(where, { limit, offset, field } = {}) {
     const conditions = this.where(where);
 

package/src/service/storage/mysql.js

@@ -44,7 +44,7 @@ module.exports = class extends Base {
 
     instance.where(this.parseWhere(where));
     if (desc) {
-      instance.order(`"${desc}" DESC`);
+      instance.order({ [desc]: 'DESC' });
     }
     if (limit || offset) {
       instance.limit(offset || 0, limit);