Merge remote-tracking branch 'origin/develop' into develop

koishijs · Aug 26, 2020 · f4e41d9 · f4e41d9
2 parents 8cd0ff8 + 0f68ab6
commit f4e41d9
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/packages/plugin-mongo/src/index.ts b/packages/plugin-mongo/src/index.ts
@@ -106,21 +106,23 @@ extendDatabase(MongoDatabase, {
   },
 
   async setUser(userId, data) {
-    const $set = { ...data }
-    if ($set.timers) {
-      for (const key in $set.timers) {
-        if (key === '$date') $set['timers._date'] = $set.timers.$date
-        else $set[`timers.${key.replace(/\./gmi, '_')}`] = $set.timers[key]
+    const $set: any = { ...data }
+    delete $set.timers
+    delete $set.usage
+    if (data.timers) {
+      $set.timers = {}
+      for (const key in data.timers) {
+        if (key === '$date') $set.timer._date = data.timers.$date
+        else $set.timer[key.replace(/\./gmi, '_')] = data.timers[key]
       }
     }
-    if ($set.usage) {
-      for (const key in $set.usage) {
-        if (key === '$date') $set['usage._date'] = $set.usage.$date
-        else $set[`usage.${key.replace(/\./gmi, '_')}`] = $set.usage[key]
+    if (data.usage) {
+      $set.usage = {}
+      for (const key in data.usage) {
+        if (key === '$date') $set.usage._date = data.usage.$date
+        else $set.usage[key.replace(/\./gmi, '_')] = data.usage[key]
       }
     }
-    delete $set.timers
-    delete $set.usage
     await this.user.updateOne({ _id: userId }, { $set }, { upsert: true })
   },