Fix Starlette 1.0.0 TemplateResponse API compatibility

web/routes/app_auth.py

@@ -52,8 +52,9 @@ def login_page(request: Request, next: str = "/"):
         return RedirectResponse(url="/setup", status_code=303)
 
     return templates.TemplateResponse(
+        request,
         "login.html",
-        {"request": request, "next": next, "error": ""},
+        {"next": next, "error": ""},
     )
 
 
@@ -68,8 +69,9 @@ def auth_login(
     user = verify_user(username, password)
     if user is None:
         return templates.TemplateResponse(
+            request,
             "login.html",
-            {"request": request, "next": next, "error": "Invalid username or password"},
+            {"next": next, "error": "Invalid username or password"},
             status_code=401,
         )
 
@@ -90,8 +92,9 @@ def setup_page(request: Request):
         return RedirectResponse(url="/login", status_code=303)
 
     return templates.TemplateResponse(
+        request,
         "setup.html",
-        {"request": request, "error": ""},
+        {"error": ""},
     )
 
 
@@ -117,8 +120,9 @@ def auth_setup(
 
     if error:
         return templates.TemplateResponse(
+            request,
             "setup.html",
-            {"request": request, "error": error},
+            {"error": error},
             status_code=400,
         )
 

web/routes/collections.py

@@ -72,9 +72,9 @@ def collections_page(request: Request, conn: sqlite3.Connection = Depends(get_db
         collections_with_covers.append(collection_dict)
 
     return templates.TemplateResponse(
+        request,
         "collections.html",
         {
-            "request": request,
             "collections": collections_with_covers
         }
     )
@@ -106,9 +106,9 @@ def collection_detail(request: Request, collection_id: int, conn: sqlite3.Connec
     grouped_games = group_games_by_igdb(games)
 
     return templates.TemplateResponse(
+        request,
         "collection_detail.html",
         {
-            "request": request,
             "collection": dict(collection),
             "games": grouped_games,
             "parse_json": parse_json_field

web/routes/discover.py

@@ -231,9 +231,9 @@ def discover(request: Request, conn: sqlite3.Connection = Depends(get_db)):
     has_igdb_ids = bool(igdb_ids)
 
     return templates.TemplateResponse(
+        request,
         "discover.html",
         {
-            "request": request,
             "highly_rated": highly_rated,
             "hidden_gems": hidden_gems,
             "most_played": most_played,

web/routes/library.py

@@ -232,9 +232,9 @@ def get_sort_key(g):
     genre_counts = dict(sorted(genre_counts.items(), key=lambda x: (-x[1], x[0].lower())))
 
     return templates.TemplateResponse(
+        request,
         "index.html",
         {
-            "request": request,
             "games": grouped_games,
             "store_counts": store_counts,
             "genre_counts": genre_counts,
@@ -304,9 +304,9 @@ def game_detail(request: Request, game_id: int, conn: sqlite3.Connection = Depen
             primary_game = g
 
     return templates.TemplateResponse(
+        request,
         "game_detail.html",
         {
-            "request": request,
             "game": primary_game,
             "store_info": store_info,
             "related_games": related_games,
@@ -355,9 +355,9 @@ def hidden_games(
     games = cursor.fetchall()
 
     return templates.TemplateResponse(
+        request,
         "hidden_games.html",
         {
-            "request": request,
             "games": games,
             "current_search": search,
             "parse_json": parse_json_field
@@ -387,9 +387,9 @@ def removed_games(
     games = cursor.fetchall()
 
     return templates.TemplateResponse(
+        request,
         "removed_games.html",
         {
-            "request": request,
             "games": games,
             "current_search": search,
             "parse_json": parse_json_field

web/routes/settings.py

@@ -76,9 +76,9 @@ def settings_page(
     hidden_count = cursor.fetchone()[0]
 
     return templates.TemplateResponse(
+        request,
         "settings.html",
         {
-            "request": request,
             "settings": settings,
             "success": success_flag,
             "hidden_count": hidden_count,