py/db.py

@@ -9,11 +9,11 @@ class DB:
         self.database = {}
 
     def ensure_username(self, data):
-        if "username" in data:
+        if 'username' in data:
-            return data.get("username")
+            return data.get('username')
-        elif "email" in data:
+        elif 'email' in data:
-            for index, entry in self.database.items():
+            for index, entry in self.database:
-                if entry.get("email") == data.get("email"):
+                if entry.get('email') == data.get('email'):
                     return index
 
     @staticmethod
@@ -23,16 +23,11 @@ class DB:
         return hashed_password
 
     def add_user(self, data):
-        username = data.get("username")
+        username = data.get('username')
-        password = data.get("password")
+        password = data.get('password')
-        email = data.get("email")
+        email = data.get('email')
         hashed_password = self.hash_password(password)
-        user_data = {
+        user_data = {"hashed_password": hashed_password, "email": email, "settings": None, "history": None}
-            "hashed_password": hashed_password,
-            "email": email,
-            "settings": None,
-            "history": None,
-        }
         if username not in self.database:
             self.database[username] = user_data
             self.save_database()
@@ -50,7 +45,7 @@ class DB:
 
     def update_password(self, data):
         username = self.ensure_username(data)
-        new_password = data.get("new_password")
+        new_password = data.get('new_password')
         if not self.check_credentials(data):
             return False
 
@@ -61,7 +56,7 @@ class DB:
 
     def check_credentials(self, data):
         username = self.ensure_username(data)
-        password = data.get("password")
+        password = data.get('password')
         if username not in self.database:
             return False
 
@@ -75,7 +70,7 @@ class DB:
         if not self.check_credentials(data):
             return False
 
-        self.database[username]["settings"] = data.get("data")
+        self.database[username]['settings'] = data.get('data')
         self.save_database()
         return True
 
@@ -84,7 +79,7 @@ class DB:
         if not self.check_credentials(data):
             return None
 
-        send_back = self.database[username].get("settings")
+        send_back = self.database[username].get('settings')
         return send_back
 
     def change_history(self, data):
@@ -92,7 +87,7 @@ class DB:
         if not self.check_credentials(data):
             return False
 
-        self.database[username]["history"] = data.get("data")
+        self.database[username]['history'] = data.get('data')
         self.save_database()
         return True
 
@@ -101,7 +96,7 @@ class DB:
         if not self.check_credentials(data):
             return None
 
-        send_back = self.database[username].get("history")
+        send_back = self.database[username].get('history')
         return send_back
 
     def get_email(self, data):
@@ -109,10 +104,11 @@ class DB:
         if not self.check_credentials(data):
             return None
 
-        send_back = self.database[username].get("email")
+        send_back = self.database[username].get('email')
         return send_back
 
     def get_name(self, data):
+        username = self.ensure_username(data)
         if not self.check_credentials(data):
             return None
 
@@ -120,18 +116,18 @@ class DB:
         return send_back
 
     def save_database(self):
-        if os.environ.get("PRODUCTION") == "YES":
+        if os.environ.get('PRODUCTION') == "YES":
             server = pycouchdb.Server("http://admin:admin@localhost:5984/")
             db = server.database("interstellar_ai")
             db.save(self.database)
 
         else:
-            with open("database.json", "w") as file:
+            with open("database.json", 'w') as file:
                 print("saving")
                 json.dump(self.database, file)
 
     def load_database(self):
-        if os.environ.get("PRODUCTION") == "YES":
+        if os.environ.get('PRODUCTION') == "YES":
             server = pycouchdb.Server("http://admin:admin@localhost:5984/")
             db = server.database("interstellar_ai")
             if db:
@@ -142,7 +138,7 @@ class DB:
                 db.save(self.database)
         else:
             try:
-                with open("database.json", "r") as file:
+                with open("database.json", 'r') as file:
                     self.database = json.load(file)
             except FileNotFoundError:
                 pass