notherbase-fs 3.3.4 → 3.3.6

package/controllers/creation.js

@@ -70,7 +70,7 @@ export default class Creation {
                 let user = await req.db.User.recallOne(req.session.currentUser);
                 if (user) {
                     context.userID = user.id;
-                    context.user = user.memory.data;
+                    context.user = user.context;
                 };
 
                 res.render(req.toRender, context);

package/models/spirit.js

@@ -41,6 +41,24 @@ export default class Spirit {
         return query;
     }
 
+    static buildBackupQuery = (service, data = null, parent = null, id = null) => {
+        let query = {
+            service: service,
+            parent: parent
+        };
+        
+        if (id) query._id = id;
+        else if (data){
+            let keys = Object.keys(data);
+            for (let i = 0; i < keys.length; i++) {
+                
+                query[`data.backups.0.data.${keys[i]}`] = data[keys[i]];
+            }
+        }
+    
+        return query;
+    }
+
     /**
      * Creates a spirit in the database.
      * @param {String} service The name of the spirit.
@@ -179,11 +197,11 @@ export default class Spirit {
      * @param {Object} data Data to add to the backup.
      */
     addBackup = async (data, max = 5) => {
-        if (!this.memory.data._backupsEnabled) {
+        if (!this.memory.data?._backupsEnabled) {
             let oldData = this.memory.data;
             this.memory.data = {
                 _backupsEnabled: true,
-                backups: [ oldData ]
+                backups: [{ _lastUpdate: Date.now(), data: oldData }]
             };
         }
 

package/models/user.js

@@ -20,22 +20,24 @@ export default class User extends Spirit {
         let query = null;
 
         if (id) {
-            query = Spirit.buildQuery("user", null, null, id);
+            query = Spirit.buildBackupQuery("user", null, null, id);
         }
         else if (username) {
-            query = Spirit.buildQuery("user", { username: username });
+            query = Spirit.buildBackupQuery("user", { username: username });
         }
         else if (email) {
-            query = Spirit.buildQuery("user", { email: email });
+            query = Spirit.buildBackupQuery("user", { email: email });
         }
         else return null;
         
+        console.log(query);
         let found = await Spirit.db.findOne(query);
 
         if (found) {
             user.memory = found;
             user.id = found._id;
-            user.email = found.data.email;
+            user.context = found.data.backups[0].data;
+            user.email = user.context.email;
             
             return user;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notherbase-fs",
-  "version": "3.3.4",
+  "version": "3.3.6",
   "description": "Functions to help make developing for NotherBase easier.",
   "exports": "./notherbase-fs.js",
   "scripts": {