@waline/vercel 1.23.2 → 1.23.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.23.2",
+  "version": "1.23.4",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -16,14 +16,14 @@
   "author": "lizheming <i@imnerd.org>",
   "dependencies": {
     "@cloudbase/node-sdk": "2.9.1",
-    "@koa/cors": "3.4.1",
+    "@koa/cors": "3.4.2",
     "akismet": "2.0.7",
     "deta": "1.1.0",
     "dompurify": "2.4.0",
     "dy-node-ip2region": "1.0.1",
     "fast-csv": "4.3.6",
     "form-data": "4.0.0",
-    "jsdom": "20.0.0",
+    "jsdom": "20.0.1",
     "jsonwebtoken": "8.5.1",
     "katex": "0.16.2",
     "leancloud-storage": "4.13.2",
@@ -32,8 +32,9 @@
     "markdown-it-sub": "1.0.0",
     "markdown-it-sup": "1.0.0",
     "mathjax-full": "3.2.2",
+    "mongodb": "4.10.0",
     "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;
@@ -623,7 +623,7 @@ module.exports = class extends BaseRest {
       : undefined;
 
     if (comment.status !== 'spam') {
-      const notify = this.service('notify');
+      const notify = this.service('notify', this);
 
       await notify.run(
         { ...cmtReturn, mail: resp.mail, rawComment: comment },
@@ -715,7 +715,7 @@ module.exports = class extends BaseRest {
         pUser = pUser[0];
       }
 
-      const notify = this.service('notify');
+      const notify = this.service('notify', this);
       const pcmtReturn = await formatCmt(
         pComment,
         pUser ? [pUser] : [],

package/src/controller/user/password.js

@@ -28,7 +28,7 @@ module.exports = class extends BaseRest {
       return this.fail();
     }
 
-    const notify = this.service('notify');
+    const notify = this.service('notify', this);
     const token = jwt.sign(user[0].email, this.config('jwtKey'));
     const profileUrl = `${this.ctx.serverURL}/ui/profile?token=${token}`;
 

package/src/controller/user.js

@@ -77,7 +77,7 @@ module.exports = class extends BaseRest {
     }
 
     try {
-      const notify = this.service('notify');
+      const notify = this.service('notify', this);
       const apiUrl =
         this.ctx.serverURL +
         '/verification?' +

package/src/locales/en.json

@@ -11,5 +11,9 @@
   "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!",
   "Duplicate Content": "Duplicate Content",
   "Comment too fast": "Comment too fast",
-  "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}."
+  "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.",
+  "MAIL_SUBJECT": "Your comment on {{site.name | safe}} received a reply",
+  "MAIL_TEMPLATE": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> Your comment on <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> received a reply </h2>{{parent.nick}}, you wrote: <div style='padding:0 12px 0 12px;margin-top:18px'> <div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{parent.comment | safe}}</div><p><strong>{{self.nick}}</strong> replied:</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p><a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>View full reply</a> or visit <a style='text-decoration:none; color:#12addb' href='{{site.url}}' target='_blank'>{{site.name}}</a>.</p><br/> </div></div>",
+  "MAIL_SUBJECT_ADMIN": "New comment on {{site.name | safe}}",
+  "MAIL_TEMPLATE_ADMIN": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> New comment on <a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a> </h2> <p><strong>{{self.nick}}</strong> wrote:</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p><a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>View page</a></p><br/></div>"
 }

package/src/locales/zh-CN.json

@@ -11,5 +11,11 @@
   "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "请尽快点击链接 <a href=\"{{url}}\">{{url}}</a> 登录并修改你的密码！",
   "Duplicate Content": "发送的内容之前已经发过",
   "Comment too fast": "评论太快啦，请慢点！",
-  "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "注册确认邮件发送失败，请{%- if isAdmin -%}检查一下网站的邮件相关配置{% else %}确认你的邮箱输入无误并联系管理员{%- endif -%}。"
+  "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "注册确认邮件发送失败，请{%- if isAdmin -%}检查一下网站的邮件相关配置{% else %}确认你的邮箱输入无误并联系管理员{%- endif -%}。",
+  "MAIL_SUBJECT": "{{parent.nick | safe}}，『{{site.name | safe}}』上的评论收到了回复",
+  "MAIL_TEMPLATE": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> 您在<a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a>上的评论有了新的回复 </h2>{{parent.nick}}同学，您曾发表评论： <div style='padding:0 12px 0 12px;margin-top:18px'> <div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{parent.comment | safe}}</div><p><strong>{{self.nick}}</strong>回复说：</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>您可以点击<a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>查看回复的完整內容</a>，欢迎再次光临<a style='text-decoration:none; color:#12addb' href='{{site.url}}' target='_blank'>{{site.name}}</a>。</p><br/> </div></div>",
+  "MAIL_SUBJECT_ADMIN": "{{site.name | safe}} 上有新评论了",
+  "MAIL_TEMPLATE_ADMIN": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> 您在<a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a>上的文章有了新的评论 </h2> <p><strong>{{self.nick}}</strong>回复说：</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>您可以点击<a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>查看回复的完整內容</a></p><br/> </div>"
 }
+
+

package/src/locales/zh-TW.json

@@ -11,5 +11,10 @@
   "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "請盡快點擊鏈接 <a href=\"{{url}}\">{{url}}</a> 登錄並修改你的密碼！",
   "Duplicate Content": "發送的內容之前已經發過",
   "Comment too fast": "評論太快啦，請慢點！",
-  "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "註冊確認郵件發送失敗，{%- if isAdmin -%}檢查一下網站的郵件相關配置{% else %}確認你的郵箱輸入無誤後聯繫管理員{%- endif -%}。"
+  "Registeration confirm mail send failed, please {%- if isAdmin -%}check your mail configuration{%- else -%}check your email address and contact administrator{%- endif -%}.": "註冊確認郵件發送失敗，{%- if isAdmin -%}檢查一下網站的郵件相關配置{% else %}確認你的郵箱輸入無誤後聯繫管理員{%- endif -%}。",
+  "MAIL_SUBJECT": "{{parent.nick | safe}}，『{{site.name | safe}}』上的評論收到回復",
+  "MAIL_TEMPLATE": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> 您在<a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a>上的品論有新的回復 </h2>{{parent.nick}}同學，您層發表評論： <div style='padding:0 12px 0 12px;margin-top:18px'> <div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{parent.comment | safe}}</div><p><strong>{{self.nick}}</strong>回復說：</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>您可以點擊<a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>查看回復的完整內容</a>，歡迎再次光臨<a style='text-decoration:none; color:#12addb' href='{{site.url}}' target='_blank'>{{site.name}}</a>。</p><br/> </div></div>",
+  "MAIL_SUBJECT_ADMIN": "{{site.name | safe}} 上有新評論了",
+  "MAIL_TEMPLATE_ADMIN": "<div style='border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;'> <h2 style='border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;'> 您在<a style='text-decoration:none;color: #12ADDB;' href='{{site.url}}' target='_blank'>{{site.name}}</a>上的文章有新評論了 </h2> <p><strong>{{self.nick}}</strong>回復說：</p><div style='background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;'>{{self.comment | safe}}</div><p>您可以點擊<a style='text-decoration:none; color:#12addb' href='{{site.postUrl}}' target='_blank'>查看回復的完整內容</a></p><br/> </div>"
+
 }

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

@@ -4,9 +4,10 @@ const fetch = require('node-fetch');
 const nunjucks = require('nunjucks');
 
 module.exports = class extends think.Service {
-  constructor(...args) {
-    super(...args);
+  constructor(ctx) {
+    super(ctx);
 
+    this.ctx = ctx;
     const {
       SMTP_USER,
       SMTP_PASS,
@@ -26,7 +27,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);
     }
@@ -53,8 +54,8 @@ module.exports = class extends think.Service {
       },
     };
 
-    title = nunjucks.renderString(title, data);
-    content = nunjucks.renderString(content, data);
+    title = this.ctx.locale(title, data);
+    content = this.ctx.locale(content, data);
 
     return this.transporter.sendMail({
       from:
@@ -379,10 +380,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
@@ -394,21 +395,8 @@ module.exports = class extends think.Service {
     const isCommentSelf =
       parent && parent.mail.toLowerCase() === comment.mail.toLowerCase();
 
-    const title = mailSubjectAdmin || '{{site.name | safe}} 上有新评论了';
-    const content =
-      mailTemplateAdmin ||
-      `
-    <div style="border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;">
-      <h2 style="border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;">
-        您在<a style="text-decoration:none;color: #12ADDB;" href="{{site.url}}" target="_blank">{{site.name}}</a>上的文章有了新的评论
-      </h2>
-      <p><strong>{{self.nick}}</strong>回复说：</p>
-      <div style="background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;">
-        {{self.comment | safe}}
-      </div>
-      <p>您可以点击<a style="text-decoration:none; color:#12addb" href="{{site.postUrl}}" target="_blank">查看回复的完整內容</a></p>
-      <br/>
-    </div>`;
+    const title = mailSubjectAdmin || 'MAIL_SUBJECT_ADMIN';
+    const content = mailTemplateAdmin || 'MAIL_TEMPLATE_ADMIN';
 
     if (!DISABLE_AUTHOR_NOTIFY && !isAuthorComment && !disableAuthorNotify) {
       const wechat = await this.wechat({ title, content }, comment, parent);
@@ -445,25 +433,8 @@ module.exports = class extends think.Service {
     ) {
       mailList.push({
         to: parent.mail,
-        title:
-          mailSubject ||
-          '{{parent.nick | safe}}，『{{site.name | safe}}』上的评论收到了回复',
-        content:
-          mailTemplate ||
-          `
-        <div style="border-top:2px solid #12ADDB;box-shadow:0 1px 3px #AAAAAA;line-height:180%;padding:0 15px 12px;margin:50px auto;font-size:12px;">
-          <h2 style="border-bottom:1px solid #DDD;font-size:14px;font-weight:normal;padding:13px 0 10px 8px;">        
-            您在<a style="text-decoration:none;color: #12ADDB;" href="{{site.url}}" target="_blank">{{site.name}}</a>上的评论有了新的回复
-          </h2>
-          {{parent.nick}} 同学，您曾发表评论：
-          <div style="padding:0 12px 0 12px;margin-top:18px">
-            <div style="background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;">{{parent.comment | safe}}</div>
-            <p><strong>{{self.nick}}</strong>回复说：</p>
-            <div style="background-color: #f5f5f5;padding: 10px 15px;margin:18px 0;word-wrap:break-word;">{{self.comment | safe}}</div>
-            <p>您可以点击<a style="text-decoration:none; color:#12addb" href="{{site.postUrl}}" target="_blank">查看回复的完整內容</a>，欢迎再次光临<a style="text-decoration:none; color:#12addb" href="{{site.url}}" target="_blank">{{site.name}}</a>。</p>
-            <br/>
-          </div>
-        </div>`,
+        title: mailSubject || 'MAIL_SUBJECT',
+        content: mailTemplate || 'MAIL_TEMPLATE',
       });
     }
 

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);

package/vanilla.js

@@ -13,7 +13,7 @@ instance.run();
 let config = {};
 
 try {
-  require('./config.js');
+  config = require('./config.js');
 } catch (e) {
   // do nothing
 }