From a7c5b3a9bcbcde6a4a6c73e60247742da0bfda23 Mon Sep 17 00:00:00 2001
From: Jack Eilles <jack@eilles.xyz>
Date: Mon, 8 Jan 2024 11:36:53 +0000
Subject: [PATCH] bug fixes

---
 app/routes.py                | 24 ++++++++++++++++++++----
 app/templates/dashboard.html |  1 +
 autoclean.py                 |  6 +++---
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index d115e61..fd73dfb 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -166,10 +166,8 @@ def getInfo(id):
 @login_required
 def delete(id):
     if Config.files.find_one({"id": id}) is not None:
-        if Config.files.find_one({"id": id}) is None:
-            return Errors.file404
-        else:
-            data = Config.files.find_one({"id": id})
+
+        data = Config.files.find_one({"id": id})
         
         if data["userid"] == current_user.userid:
             Config.files.delete_one({"id": id})
@@ -184,6 +182,24 @@ def delete(id):
         else:
             return "You are not the owner of this file."
 
+    elif Config.url.find_one({"id": id}) is not None:
+
+        data = Config.url.find_one({"id": id})
+
+        if data["userid"] == current_user.userid:
+            Config.files.delete_one({"id": id})
+            return "URL deleted."
+        
+        elif data["userid"] == request.form.get("userid") and bcrypt.check_password_hash(Config.user.find_one({"userid": data["userid"]})["idpass"], request.form.get("idpass")):
+            Config.files.delete_one({"id": id})
+            return "URL deleted."
+        
+        else:
+            return "You are not the owner of this link."
+    
+    else:
+        return "This ID does not exist."
+
 @app.route('/teapot')
 def teapot():
     return 'I\'m a teapot. 418.', 418
diff --git a/app/templates/dashboard.html b/app/templates/dashboard.html
index f7b7d4d..a107158 100644
--- a/app/templates/dashboard.html
+++ b/app/templates/dashboard.html
@@ -17,6 +17,7 @@
     <table>
         <tr>
             <th>ID</th>
+            
             <th>Filename</th>
             <th>Size</th>
             <th>Retention</th>
diff --git a/autoclean.py b/autoclean.py
index b0443db..c0647a1 100755
--- a/autoclean.py
+++ b/autoclean.py
@@ -40,9 +40,9 @@ def main():
             os.remove(os.path.join(Config.fileDir, file["filename"]))
 
         # Delete all expired URL's
-        for url in expiredURLs:
-            print(f"Deleting URL {url['id']}")
-            Config.url.delete_one({"id": url["id"]})
+        for urls in expiredURLs:
+            print(f"Deleting URL {urls['id']}")
+            Config.url.delete_one({"id": urls["id"]})
 
         print("Cleanup complete.")
         time.sleep(60)