file path fixes for osu redirects (osuAkatsuki#550)

* file path fixes for osu redirects * undo changes
nekoraw · Dec 1, 2023 · bb1c160 · bb1c160
1 parent 3ccce28
commit bb1c160
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/app/api/domains/cho.py b/app/api/domains/cho.py
@@ -68,7 +68,6 @@
 
 BASE_DOMAIN = app.settings.DOMAIN
 
-# TODO: dear god
 NOW_PLAYING_RGX = re.compile(
     r"^\x01ACTION is (?:playing|editing|watching|listening to) "
     rf"\[https://osu\.(?:{re.escape(BASE_DOMAIN)}|ppy\.sh)/beatmapsets/(?P<sid>\d{{1,10}})#/?(?:osu|taiko|fruits|mania)?/(?P<bid>\d{{1,10}})/? .+\]"

diff --git a/app/api/domains/osu.py b/app/api/domains/osu.py
@@ -1723,18 +1723,17 @@ async def checkUpdates(
 
 
 if app.settings.REDIRECT_OSU_URLS:
-    # NOTE: this will likely be removed with the addition of a frontend.
-    async def osu_redirect(request: Request, _: int = Path(...)) -> Response:
+
+    async def osu_redirect(file_path: str) -> Response:
         return RedirectResponse(
-            url=f"https://osu.ppy.sh{request['path']}",
+            url=f"https://osu.ppy.sh{file_path}",
             status_code=status.HTTP_301_MOVED_PERMANENTLY,
         )
 
     for pattern in (
-        "/beatmapsets/{_}",
-        "/beatmaps/{_}",
-        "/beatmapsets/{_}/discussion",
-        "/community/forums/topics/{_}",
+        "/beatmapsets/{file_path:path}",
+        "/beatmaps/{file_path:path}",
+        "/community/forums/topics/{file_path:path}",
     ):
         router.get(pattern)(osu_redirect)