set cookie within header

SylteA · Nov 18, 2023 · 5223fdc · 5223fdc
1 parent a426f7f
commit 5223fdc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/bot/extensions/adventofcode/utils.py b/bot/extensions/adventofcode/utils.py
@@ -1,5 +1,5 @@
 from datetime import datetime, timedelta
-from typing import Optional
+from typing import Optional, Union
 from zoneinfo import ZoneInfo
 
 import discord
@@ -12,8 +12,10 @@
 LEADERBOARD_ID = settings.aoc.leaderboard_id
 LEADERBOARD_CODE = settings.aoc.leaderboard_code
 API_URL = f"https://adventofcode.com/{YEAR}/leaderboard/private/view/{LEADERBOARD_ID}.json"
-AOC_REQUEST_HEADER = {"User-Agent": "Tech With Tim Discord Bot https://github.com/SylteA/Discord-Bot"}
-AOC_SESSION_COOKIE = {"session": settings.aoc.session_cookie}
+AOC_REQUEST_HEADERS = {
+    "User-Agent": "Tech With Tim Discord Bot https://github.com/SylteA/Discord-Bot",
+    "Cookie": f"session={settings.aoc.session_cookie}",
+}
 
 
 def home_embed():
@@ -80,15 +82,16 @@ def set_name_to_anonymous(cls, val: Optional[str]) -> str:
         return val
 
 
-async def fetch_leaderboard(local: bool = False) -> str:
+async def fetch_leaderboard(local: bool = False) -> Union[str, dict]:
     url = f"https://adventofcode.com/{YEAR}/leaderboard"
     if local:
         url += f"/private/view/{LEADERBOARD_ID}.json"
 
-    http.session.cookie_jar.update_cookies(AOC_SESSION_COOKIE)
-    async with http.session.get(url, headers=AOC_REQUEST_HEADER, raise_for_status=True) as resp:
+    async with http.session.get(url, headers=AOC_REQUEST_HEADERS, raise_for_status=True) as resp:
         if resp.status == 200:
-            response = await resp.text()
-    http.session.cookie_jar.clear()
+            if local:
+                response = await resp.json()
+            else:
+                response = await resp.text()
 
     return response
diff --git a/bot/extensions/adventofcode/views.py b/bot/extensions/adventofcode/views.py
@@ -1,4 +1,3 @@
-import json
 import re
 from datetime import datetime
 from zoneinfo import ZoneInfo
@@ -31,7 +30,6 @@ async def home(self, interaction: core.InteractionType, _button: ui.Button):
     )
     async def local_leaderboard(self, interaction: core.InteractionType, button: ui.Button):
         leaderboard = await fetch_leaderboard(local=True)
-        leaderboard = json.loads(leaderboard)
 
         members = [Member(**member_data) for member_data in leaderboard["members"].values()]