@waline/vercel 1.13.1 → 1.13.4

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@waline/vercel",
-  "version": "1.13.1",
+  "version": "1.13.4",
   "description": "vercel server for waline comment system",
   "repository": "https://github.com/walinejs/waline",
   "license": "MIT",
   "author": "lizheming <i@imnerd.org>",
   "dependencies": {
     "@cloudbase/node-sdk": "^2.9.0",
-    "@koa/cors": "^3.2.0",
-    "akismet": "^2.0.6",
+    "@koa/cors": "^3.3.0",
+    "akismet": "^2.0.7",
     "deta": "^1.1.0",
     "dompurify": "^2.3.6",
     "fast-csv": "^4.3.6",
@@ -31,8 +31,8 @@
     "think-logger3": "^1.3.1",
     "think-model": "^1.5.4",
     "think-model-mysql": "^1.1.7",
-    "think-model-postgresql": "^1.1.6",
-    "think-model-sqlite": "^1.2.2",
+    "think-model-postgresql": "1.1.7",
+    "think-model-sqlite": "^1.2.3",
     "think-mongo": "^2.1.2",
     "think-router-rest": "^1.0.5",
     "thinkjs": "^3.2.14",

package/src/config/extend.js

@@ -5,6 +5,17 @@ module.exports = [
   Model(think.app),
   Mongo(think.app),
   {
+    context: {
+      get serverURL() {
+        const { SERVER_URL } = process.env;
+        if (SERVER_URL) {
+          return SERVER_URL;
+        }
+
+        const { protocol, host, path, controller } = this;
+        return `${protocol}://${host}${path.slice(0, -controller.length)}`;
+      },
+    },
     controller: {
       fail(...args) {
         if (this.ctx.status === 200) {

package/src/controller/comment.js

@@ -375,10 +375,9 @@ module.exports = class extends BaseRest {
       think.logger.debug(`Comment initial status is ${data.status}`);
 
       if (data.status === 'approved') {
-        const spam = await akismet(
-          data,
-          this.ctx.protocol + '://' + this.ctx.host
-        ).catch((e) => console.log(e)); // ignore akismet error
+        const spam = await akismet(data, this.ctx.serverURL).catch((e) =>
+          console.log(e)
+        ); // ignore akismet error
 
         if (spam === true) {
           data.status = 'spam';

package/src/controller/oauth.js

@@ -18,8 +18,8 @@ module.exports = class extends think.Controller {
     const hasCode =
       type === 'twitter' ? oauth_token && oauth_verifier : Boolean(code);
     if (!hasCode) {
-      const { protocol, host } = this.ctx;
-      const redirectUrl = `${protocol}://${host}/oauth?${qs.stringify({
+      const { serverURL } = this.ctx;
+      const redirectUrl = `${serverURL}/oauth?${qs.stringify({
         redirect,
         type,
       })}`;
@@ -36,8 +36,8 @@ module.exports = class extends think.Controller {
      */
     const params = { code, oauth_verifier, oauth_token };
     if (type === 'facebook') {
-      const { protocol, host } = this.ctx;
-      const redirectUrl = `${protocol}://${host}/oauth?${qs.stringify({
+      const { serverURL } = this.ctx;
+      const redirectUrl = `${serverURL}/oauth?${qs.stringify({
         redirect,
         type,
       })}`;

package/src/controller/user/password.js

@@ -27,9 +27,8 @@ module.exports = class extends BaseRest {
     }
 
     const notify = this.service('notify');
-    const { protocol, host } = this.ctx;
     const token = jwt.sign(user[0].email, this.config('jwtKey'));
-    const profileUrl = `${protocol}://${host}/ui/profile?token=${token}`;
+    const profileUrl = `${this.ctx.serverURL}/ui/profile?token=${token}`;
 
     await notify.transporter.sendMail({
       from:

package/src/controller/user.js

@@ -58,9 +58,7 @@ module.exports = class extends BaseRest {
 
     const notify = this.service('notify');
     const apiUrl =
-      this.ctx.protocol +
-      '://' +
-      this.ctx.host +
+      this.ctx.serverURL +
       '/verification?' +
       qs.stringify({ token, email: data.email });
 

package/src/service/notify.js

@@ -354,7 +354,7 @@ module.exports = class extends think.Service {
   }
 
   async run(comment, parent, disableAuthorNotify = false) {
-    const { AUTHOR_EMAIL, BLOGGER_EMAIL } = process.env;
+    const { AUTHOR_EMAIL, BLOGGER_EMAIL, DISABLE_AUTHOR_NOTIFY } = process.env;
     const { mailSubject, mailTemplate, mailSubjectAdmin, mailTemplateAdmin } =
       think.config();
     const AUTHOR = AUTHOR_EMAIL || BLOGGER_EMAIL;
@@ -383,7 +383,7 @@ module.exports = class extends think.Service {
       <br/>
     </div>`;
 
-    if (!isAuthorComment && !disableAuthorNotify) {
+    if (!DISABLE_AUTHOR_NOTIFY && !isAuthorComment && !disableAuthorNotify) {
       const wechat = await this.wechat({ title, content }, comment, parent);
       const qywxAmWechat = await this.qywxAmWechat(
         { title, content },