minor fixes

iliakan · iliakan · commit 37eb1646fbc8 · 2024-10-09T10:55:26.000+02:00
diff --git a/i18n/t.js b/i18n/t.js
@@ -28,7 +28,9 @@ if (LANG !== 'en') {
   i18n.setFallback(LANG, 'en');
 }
 
-i18n.add = (...args) => i18n.addPhrase(LANG, ...args);
+i18n.add = (...args) => {
+  args = args.map(arg => arg.__esModule ? arg.default : arg);
+  return i18n.addPhrase(LANG, ...args);
+};
 
 t.i18n = i18n;
-
diff --git a/koa/tutorial/tasks/import.js b/koa/tutorial/tasks/import.js
@@ -15,7 +15,7 @@ module.exports = async function() {
   await runImport();
 
   if (CacheEntry) {
-    await CacheEntry.remove({});
+    await CacheEntry.deleteMany({});
   }
 
   console.log("Tutorial import finished.");
diff --git a/mongoose/index.js b/mongoose/index.js
@@ -72,19 +72,17 @@ mongoose.plugin(function(schema) {
   schema.methods.persist = function(body) {
     let model = this;
 
-    return new Promise((resolve, reject) => {
+    return new Promise(async(resolve, reject) => {
 
       log.trace("mongoose persist", body);
 
       if (body) model.set(body);
+      let changed;
 
-      model.save(function(err, changed) {
-
-        log.trace("mongoose persist save", err, changed);
-
-        if (!err) {
-          return resolve(changed);
-        }
+      try {
+        changed = await model.save();
+        return resolve(changed);
+      } catch(err) {
         if (err && err.code != 11000) {
           return reject(err);
         }
@@ -176,7 +174,7 @@ mongoose.plugin(function(schema) {
           return reject(valError);
         });
 
-      });
+      }
     });
   };
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ module.exports = async function() {`
`15`	`15`	`await runImport();`
`16`	`16`
`17`	`17`	`if (CacheEntry) {`
`18`		`- await CacheEntry.remove({});`
	`18`	`+ await CacheEntry.deleteMany({});`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`console.log("Tutorial import finished.");`