From f36752019151de75ea5689fd929e2675ad4ce5d1 Mon Sep 17 00:00:00 2001
From: nsde <neostyxde@gmail.com>
Date: Sun, 17 Sep 2023 21:41:16 +0200
Subject: [PATCH] Organized code

---
 api/core.py | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/api/core.py b/api/core.py
index c762c68..a53320d 100644
--- a/api/core.py
+++ b/api/core.py
@@ -36,25 +36,6 @@ async def check_core_auth(request):
 
     return None
 
-@router.get('/users')
-async def get_users(discord_id: int, incoming_request: fastapi.Request):
-    """Returns a user by their discord ID. Requires a core API key."""
-
-    auth = await check_core_auth(incoming_request)
-    if auth:
-        return auth
-
-    # Get user by discord ID
-    manager = UserManager()
-    user = await manager.user_by_discord_id(discord_id)
-    if not user:
-        return await errors.error(404, 'Discord user not found in the API database.', 'Check the `discord_id` parameter.')
-
-    # turn the ObjectId into a string
-    user['_id'] = str(user['_id'])
-
-    return user
-
 async def new_user_webhook(user: dict) -> None:
     """Runs when a new user is created."""
 
@@ -73,6 +54,25 @@ async def new_user_webhook(user: dict) -> None:
 
     dhook.send(content=f'<@{dc}>', embed=embed)
 
+
+@router.get('/users')
+async def get_users(discord_id: int, incoming_request: fastapi.Request):
+    """Returns a user by their discord ID. Requires a core API key."""
+
+    auth = await check_core_auth(incoming_request)
+    if auth: return auth
+
+    # Get user by discord ID
+    manager = UserManager()
+    user = await manager.user_by_discord_id(discord_id)
+    if not user:
+        return await errors.error(404, 'Discord user not found in the API database.', 'Check the `discord_id` parameter.')
+
+    # turn the ObjectId into a string
+    user['_id'] = str(user['_id'])
+
+    return user
+
 @router.post('/users')
 async def create_user(incoming_request: fastapi.Request):
     """Creates a user. Requires a core API key."""
@@ -102,9 +102,7 @@ async def update_user(incoming_request: fastapi.Request):
     """Updates a user. Requires a core API key."""
 
     auth_error = await check_core_auth(incoming_request)
-
-    if auth_error:
-        return auth_error
+    if auth_error: return auth_error
 
     try:
         payload = await incoming_request.json()
@@ -127,9 +125,7 @@ async def run_checks(incoming_request: fastapi.Request):
     """Tests the API. Requires a core API key."""
 
     auth_error = await check_core_auth(incoming_request)
-
-    if auth_error:
-        return auth_error
+    if auth_error: return auth_error
 
     results = {}