fix: Fix missing avatar crashing login page

seriaati · Oct 20, 2024 · d2836ef · d2836ef
1 parent 189cb94
commit d2836ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/hoyo_buddy/web_app/app.py b/hoyo_buddy/web_app/app.py
@@ -578,7 +578,7 @@ async def oauth_callback(self, params: dict[str, str]) -> ft.View | None:
             if user_id is None:
                 return pages.ErrorPage(code=400, message="Missing user ID")
 
-            page.session.set("hb.user_id", user_id)
+            page.session.set("hb.user_id", int(user_id))
 
         original_route = await page.client_storage.get_async("hb.original_route")
         if original_route:

diff --git a/hoyo_buddy/web_app/pages/login.py b/hoyo_buddy/web_app/pages/login.py
@@ -77,8 +77,8 @@ def get_user_avatar_url(self) -> str:
         avatar = user_data.get("avatar")
         if avatar is None:
             migrated = user_data["discriminator"] == "0"
-            index = (user_data["id"] >> 22) % 6 if migrated else user_data["discriminator"] % 5
-            return f"{base_url}/embed/avatars/{index}.webp"
+            index = (int(user_data["id"]) >> 22) % 6 if migrated else int(user_data["discriminator"]) % 5
+            return f"{base_url}/embed/avatars/{index}.png"
 
         if avatar.startswith("a_"):
             return f"{base_url}/avatars/{user_data['id']}/{avatar}.gif"
@@ -88,7 +88,7 @@ async def on_continue_button_click(self, e: ft.ControlEvent) -> None:
         assert self.user_data is not None
 
         page: ft.Page = e.page
-        page.session.set("hb.user_id", self.user_data["id"])
+        page.session.set("hb.user_id", int(self.user_data["id"]))
 
         original_route = await page.client_storage.get_async("hb.original_route")
         if original_route: