From fbb91004ca61ba40fa77e2760b037132e6ea8b81 Mon Sep 17 00:00:00 2001
From: 0xMRTT <0xMRTT@proton.me>
Date: Fri, 24 Feb 2023 13:04:25 +0100
Subject: [PATCH] fix(urls): use path and path converters

---
 avatar/urls.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/avatar/urls.py b/avatar/urls.py
index 9a043f8..fbf7f96 100644
--- a/avatar/urls.py
+++ b/avatar/urls.py
@@ -1,18 +1,23 @@
-from django.urls import re_path
+from django.urls import re_path, path
 
 from avatar import views
 
+# For reverseing namespaced urls
+# https://docs.djangoproject.com/en/4.1/topics/http/urls/#reversing-namespaced-urls
+app_name = "avatar"
+
 urlpatterns = [
-    re_path(r"^add/$", views.add, name="avatar_add"),
-    re_path(r"^change/$", views.change, name="avatar_change"),
-    re_path(r"^delete/$", views.delete, name="avatar_delete"),
-    re_path(
-        r"^render_primary/(?P<user>[\w\d\@\.\-_]+)/(?P<width>[\d]+)/$",
+    path("add/", views.add, name="avatar_add"),
+    path("change/", views.change, name="avatar_change"),
+    path("delete/", views.delete, name="avatar_delete"),
+    # https://docs.djangoproject.com/en/4.1/topics/http/urls/#path-converters
+    path(
+        "render_primary/<slug:user>/<int:width>/",
         views.render_primary,
         name="avatar_render_primary",
     ),
     re_path(
-        r"^render_primary/(?P<user>[\w\d\@\.\-_]+)/(?P<width>[\d]+)/(?P<height>[\d]+)/$",
+        "render_primary/<slug:user>/<int:width>/<int:height>",
         views.render_primary,
         name="avatar_render_primary",
     ),