@waline/vercel 1.4.1 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.4.1",
+  "version": "1.6.1",
   "description": "vercel server for waline comment system",
   "repository": "https://github.com/walinejs/waline",
   "license": "MIT",

package/src/config/config.js

@@ -36,6 +36,7 @@ const {
   MAIL_TEMPLATE_ADMIN,
   QQ_TEMPLATE,
   TG_TEMPLATE,
+  WX_TEMPLATE,
 } = process.env;
 
 let storage = 'leancloud';
@@ -105,7 +106,7 @@ module.exports = {
   forbiddenWords,
   disallowIPList: [],
   secureDomains: SECURE_DOMAINS ? SECURE_DOMAINS.split(/\s*,\s*/) : undefined,
-  disableUserAgent: !isFalse(DISABLE_USERAGENT),
+  disableUserAgent: DISABLE_USERAGENT && !isFalse(DISABLE_USERAGENT),
   avatarProxy,
   oauthUrl,
   markdown,
@@ -115,4 +116,5 @@ module.exports = {
   mailTemplateAdmin: MAIL_TEMPLATE_ADMIN,
   QQTemplate: QQ_TEMPLATE,
   TGTemplate: TG_TEMPLATE,
+  WXTemplate: WX_TEMPLATE,
 };

package/src/config/middleware.js

@@ -3,6 +3,8 @@ const routerREST = require('think-router-rest');
 const isDev = think.env === 'development';
 const isTcb = think.env === 'cloudbase';
 const isDeta = think.env === 'deta' || process.env.DETA_RUNTIME === 'true';
+const isAliyunFC =
+  think.env === 'aliyun-fc' || Boolean(process.env.FC_RUNTIME_VERSION);
 
 module.exports = [
   {
@@ -15,7 +17,7 @@ module.exports = [
     options: {
       logRequest: isDev,
       sendResponseTime: isDev,
-      requestTimeoutCallback: isTcb || isDeta ? false : () => {},
+      requestTimeoutCallback: isTcb || isDeta || isAliyunFC ? false : () => {},
     },
   },
 

package/src/controller/comment.js

@@ -4,6 +4,7 @@ const BaseRest = require('./rest');
 const akismet = require('../service/akismet');
 const { getMarkdownParser } = require('../service/markdown');
 
+const markdownParser = getMarkdownParser();
 async function formatCmt(
   { ua, user_id, ...comment },
   users = [],
@@ -39,6 +40,7 @@ async function formatCmt(
     comment.mail ? comment.mail.toLowerCase() : comment.mail
   );
 
+  comment.comment = markdownParser(comment.comment);
   return comment;
 }
 
@@ -49,8 +51,6 @@ module.exports = class extends BaseRest {
       `storage/${this.config('storage')}`,
       'Comment'
     );
-
-    this.parser = getMarkdownParser();
   }
 
   async getAction() {
@@ -154,13 +154,33 @@ module.exports = class extends BaseRest {
           offset: Math.max((page - 1) * pageSize, 0),
         });
 
+        const userModel = this.service(
+          `storage/${this.config('storage')}`,
+          'Users'
+        );
+        const user_ids = Array.from(
+          new Set(comments.map(({ user_id }) => user_id).filter((v) => v))
+        );
+
+        let users = [];
+        if (user_ids.length) {
+          users = await userModel.select(
+            { objectId: ['IN', user_ids] },
+            {
+              field: ['display_name', 'email', 'url', 'type', 'avatar'],
+            }
+          );
+        }
+
         return this.success({
           page,
           totalPages: Math.ceil(count / pageSize),
           pageSize,
           spamCount,
           waitingCount,
-          data: comments,
+          data: await Promise.all(
+            comments.map((cmt) => formatCmt(cmt, users, this.config()))
+          ),
         });
       }
 
@@ -248,17 +268,14 @@ module.exports = class extends BaseRest {
       rid,
       ua,
       url,
+      comment,
       ip: this.ctx.ip,
       insertedAt: new Date(),
-      comment: this.parser(comment),
       user_id: this.ctx.state.userInfo.objectId,
     };
 
     if (pid) {
-      data.comment = data.comment.replace(
-        '<p>',
-        `<p><a class="at" href="#${pid}">@${at}</a>: `
-      );
+      data.comment = `[@${at}](#${pid}): ` + data.comment;
     }
 
     think.logger.debug('Post Comment initial Data:', data);

package/src/service/notify.js

@@ -91,6 +91,81 @@ module.exports = class extends think.Service {
     });
   }
 
+  async qywxAmWechat({ title, content }, self, parent) {
+    const { QYWX_AM, SITE_NAME, SITE_URL } = process.env;
+    if (!QYWX_AM) {
+      return false;
+    }
+
+    const QYWX_AM_AY = QYWX_AM.split(',');
+    const comment = self.comment
+      .replace(/<a href="(.*?)">(.*?)<\/a>/g, '\n[$2] $1\n')
+      .replace(/<[^>]+>/g, '');
+    const postName = self.url;
+
+    const data = {
+      self: {
+        ...self,
+        comment,
+      },
+      postName,
+      parent,
+      site: {
+        name: SITE_NAME,
+        url: SITE_URL,
+        postUrl: SITE_URL + self.url + '#' + self.objectId,
+      },
+    };
+    const contentWechat =
+      think.config('WXTemplate') ||
+      `💬 {{site.name|safe}}的文章《{{postName}}》有新评论啦 
+【评论者昵称】：{{self.nick}}
+【评论者邮箱】：{{self.mail}} 
+【内容】：{{self.comment}} 
+<a href='{{site.postUrl}}'>查看详情</a>`;
+
+    title = nunjucks.renderString(title, data);
+    const desp = nunjucks.renderString(contentWechat, data);
+    content = desp.replace(/\n/g, '<br/>');
+
+    const { access_token } = await request({
+      uri: `https://qyapi.weixin.qq.com/cgi-bin/gettoken`,
+      qs: {
+        corpid: `${QYWX_AM_AY[0]}`,
+        corpsecret: `${QYWX_AM_AY[1]}`,
+      },
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      json: true,
+    });
+    return request({
+      url: `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${access_token}`,
+      body: {
+        touser: `${QYWX_AM_AY[2]}`,
+        agentid: `${QYWX_AM_AY[3]}`,
+        msgtype: 'mpnews',
+        mpnews: {
+          articles: [
+            {
+              title,
+              thumb_media_id: `${QYWX_AM_AY[4]}`,
+              author: `Waline Comment`,
+              content_source_url: `${data.site.postUrl}`,
+              content: `${content}`,
+              digest: `${desp}`,
+            },
+          ],
+        },
+      },
+      method: 'POST',
+      json: true,
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    });
+  }
+
   async qq(self, parent) {
     const { QMSG_KEY, QQ_ID, SITE_NAME, SITE_URL } = process.env;
     if (!QMSG_KEY) {
@@ -212,7 +287,7 @@ module.exports = class extends think.Service {
       ? parent && parent.mail.toLowerCase() === AUTHOR.toLowerCase()
       : false;
 
-    const title = mailSubjectAdmin || '{{site.name}} 上有新评论了';
+    const title = mailSubjectAdmin || '{{site.name | safe}} 上有新评论了';
     const content =
       mailTemplateAdmin ||
       `
@@ -230,12 +305,18 @@ module.exports = class extends think.Service {
 
     if (!isAuthorComment && !disableAuthorNotify) {
       const wechat = await this.wechat({ title, content }, comment, parent);
+      const qywxAmWechat = await this.qywxAmWechat(
+        { title, content },
+        comment,
+        parent
+      );
       const qq = await this.qq(comment, parent);
       const telegram = await this.telegram(comment, parent);
       if (
         think.isEmpty(wechat) &&
         think.isEmpty(qq) &&
         think.isEmpty(telegram) &&
+        think.isEmpty(qywxAmWechat) &&
         !isReplyAuthor
       ) {
         mailList.push({ to: AUTHOR, title, content });
@@ -250,7 +331,8 @@ module.exports = class extends think.Service {
       mailList.push({
         to: parent.mail,
         title:
-          mailSubject || '{{parent.nick}}，『{{site.name}}』上的评论收到了回复',
+          mailSubject ||
+          '{{parent.nick | safe}}，『{{site.name | safe}}』上的评论收到了回复',
         content:
           mailTemplate ||
           `

package/src/service/storage/cloudbase.js

@@ -115,8 +115,9 @@ module.exports = class extends Base {
   async select(where, options = {}) {
     let data = [];
     let ret = [];
+    let offset = options.offset || 0;
     do {
-      options.offset = (options.offset || 0) + data.length;
+      options.offset = offset + data.length;
       ret = await this._select(where, options);
       data = data.concat(ret);
     } while (ret.length === 100);

package/src/service/storage/inspirecloud.js

@@ -16,7 +16,8 @@ module.exports = class extends Base {
     const parseKey = (k) => (k === 'objectId' ? '_id' : k);
     for (const k in where) {
       if (think.isString(where[k])) {
-        _where[parseKey(k)] = k === 'objectId' ? this.db.ObjectId(where[k]) : where[k];
+        _where[parseKey(k)] =
+          k === 'objectId' ? this.db.ObjectId(where[k]) : where[k];
         continue;
       }
       if (where[k] === undefined) {
@@ -100,8 +101,9 @@ module.exports = class extends Base {
   async select(where, options = {}) {
     let data = [];
     let ret = [];
+    let offset = options.offset || 0;
     do {
-      options.offset = (options.offset || 0) + data.length;
+      options.offset = offset + data.length;
       ret = await this._select(where, options);
       data = data.concat(ret);
     } while (ret.length === 1000);

package/src/service/storage/leancloud.js

@@ -88,8 +88,9 @@ module.exports = class extends Base {
   async select(where, options = {}) {
     let data = [];
     let ret = [];
+    let offset = options.offset || 0;
     do {
-      options.offset = (options.offset || 0) + data.length;
+      options.offset = offset + data.length;
       ret = await this._select(where, options);
       data = data.concat(ret);
     } while (ret.length === 100);