@waline/vercel 1.32.2 → 1.32.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.32.2",
+  "version": "1.32.3",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -23,7 +23,7 @@
     "@mdit/plugin-sup": "0.8.0",
     "akismet": "^2.0.7",
     "deta": "^2.0.0",
-    "dompurify": "^3.1.7",
+    "dompurify": "^3.2.2",
     "dy-node-ip2region": "^1.0.1",
     "fast-csv": "^5.0.2",
     "form-data": "^4.0.1",
@@ -51,7 +51,7 @@
     "think-mongo": "^2.2.1",
     "think-router-rest": "^1.0.5",
     "thinkjs": "^3.2.15",
-    "ua-parser-js": "^1.0.39"
+    "ua-parser-js": "^2.0.0"
   },
   "engines": {
     "node": ">=16"

package/src/extend/controller.js

@@ -20,7 +20,7 @@ module.exports = {
     return this[this.ctx.state.deprecated ? 'json' : 'success'](...args);
   },
   locale(message, variables) {
-    const { userLang } = this.get();
+    const { lang: userLang } = this.get();
     const lang = (userLang || defaultLang).toLowerCase();
 
     const customLocales = this.config('locales');

package/src/service/notify.js

@@ -111,7 +111,8 @@ module.exports = class extends think.Service {
   }
 
   async qywxAmWechat({ title, content }, self, parent) {
-    const { QYWX_AM, QYWX_PROXY, QYWX_PROXY_PORT, SITE_NAME, SITE_URL } = process.env;
+    const { QYWX_AM, QYWX_PROXY, QYWX_PROXY_PORT, SITE_NAME, SITE_URL } =
+      process.env;
 
     if (!QYWX_AM) {
       return false;
@@ -156,6 +157,7 @@ module.exports = class extends think.Service {
     querystring.set('corpsecret', `${QYWX_AM_AY[1]}`);
 
     let baseUrl = 'https://qyapi.weixin.qq.com';
+
     if (QYWX_PROXY) {
       if (!QYWX_PROXY_PORT) {
         baseUrl = `http://${QYWX_PROXY}`;

package/src/service/storage/postgresql.js

@@ -1,5 +1,21 @@
 const MySQL = require('./mysql.js');
 
+function mapKeys({ insertedat, createdat, updatedat, ...item }) {
+  const mapFields = {
+    insertedAt: insertedat,
+    createdAt: createdat,
+    updatedAt: updatedat,
+  };
+
+  for (const field in mapFields) {
+    if (!mapFields[field]) {
+      continue;
+    }
+    item[field] = mapFields[field];
+  }
+
+  return item;
+}
 module.exports = class extends MySQL {
   model(tableName) {
     return super.model(tableName.toLowerCase());
@@ -22,22 +38,7 @@ module.exports = class extends MySQL {
 
     const data = await super.select(lowerWhere, options);
 
-    return data.map(({ insertedat, createdat, updatedat, ...item }) => {
-      const mapFields = {
-        insertedAt: insertedat,
-        createdAt: createdat,
-        updatedAt: updatedat,
-      };
-
-      for (const field in mapFields) {
-        if (!mapFields[field]) {
-          continue;
-        }
-        item[field] = mapFields[field];
-      }
-
-      return item;
-    });
+    return data.map(mapKeys);
   }
 
   async add(data) {
@@ -53,7 +54,7 @@ module.exports = class extends MySQL {
         delete data[key];
       });
 
-    return super.add(data);
+    return super.add(data).then(mapKeys);
   }
 
   async count(...args) {