Fix #1056 - Add flag to accept URLs without a trailing slash

1 files changed, 44 insertions, 28 deletions

diff --git a/mediagoblin/federation/routing.py b/mediagoblin/federation/routing.py
index dddb5df5..b585750b 100644
--- a/mediagoblin/federation/routing.py
+++ b/mediagoblin/federation/routing.py
@@ -20,74 +20,87 @@ from mediagoblin.tools.routing import add_route
 add_route(
     "mediagoblin.federation.user",
     "/api/user/<string:username>/",
-    "mediagoblin.federation.views:user_endpoint"
+    "mediagoblin.federation.views:user_endpoint",
+    match_slash=False
 )
 
 add_route(
     "mediagoblin.federation.user.profile",
-    "/api/user/<string:username>/profile",
-    "mediagoblin.federation.views:profile_endpoint"
+    "/api/user/<string:username>/profile/",
+    "mediagoblin.federation.views:profile_endpoint",
+    match_slash=False
 )
 
 # Inbox and Outbox (feed)
 add_route(
     "mediagoblin.federation.feed",
-    "/api/user/<string:username>/feed",
-    "mediagoblin.federation.views:feed_endpoint"
+    "/api/user/<string:username>/feed/",
+    "mediagoblin.federation.views:feed_endpoint",
+    match_slash=False
 )
 
 add_route(
     "mediagoblin.federation.user.uploads",
-    "/api/user/<string:username>/uploads",
-    "mediagoblin.federation.views:uploads_endpoint"
+    "/api/user/<string:username>/uploads/",
+    "mediagoblin.federation.views:uploads_endpoint",
+    match_slash=False
 )
 
 add_route(
     "mediagoblin.federation.inbox",
-    "/api/user/<string:username>/inbox",
-    "mediagoblin.federation.views:inbox_endpoint"
+    "/api/user/<string:username>/inbox/",
+    "mediagoblin.federation.views:inbox_endpoint",
+    match_slash=False
 )
 
 add_route(
     "mediagoblin.federation.inbox_minor",
-    "/api/user/<string:username>/inbox/minor",
-    "mediagoblin.federation.views:inbox_minor_endpoint"
+    "/api/user/<string:username>/inbox/minor/",
+    "mediagoblin.federation.views:inbox_minor_endpoint",
+    match_slash=False
 )
 
 add_route(
     "mediagoblin.federation.inbox_major",
-    "/api/user/<string:username>/inbox/major",
-    "mediagoblin.federation.views:inbox_major_endpoint"
+    "/api/user/<string:username>/inbox/major/",
+    "mediagoblin.federation.views:inbox_major_endpoint",
+    match_slash=False
 )
 
 add_route(
     "mediagoblin.federation.inbox_direct",
-    "/api/user/<string:username>/inbox/direct",
-    "mediagoblin.federation.views:inbox_endpoint"
+    "/api/user/<string:username>/inbox/direct/",
+    "mediagoblin.federation.views:inbox_endpoint",
+    match_slash=False
 )
 
 add_route(
     "mediagoblin.federation.inbox_direct_minor",
     "/api/user/<string:username>/inbox/direct/minor",
-    "mediagoblin.federation.views:inbox_minor_endpoint"
+    "mediagoblin.federation.views:inbox_minor_endpoint",
+    match_slash=False
 )
 
 add_route(
     "mediagoblin.federation.inbox_direct_major",
     "/api/user/<string:username>/inbox/direct/major",
-    "mediagoblin.federation.views:inbox_major_endpoint"
+    "mediagoblin.federation.views:inbox_major_endpoint",
+    match_slash=False
 )
 
 # object endpoints
 add_route(
     "mediagoblin.federation.object",
-    "/api/<string:object_type>/<string:id>",
-    "mediagoblin.federation.views:object_endpoint"
-    )
+    "/api/<string:object_type>/<string:id>/",
+    "mediagoblin.federation.views:object_endpoint",
+    match_slash=False
+)
+
 add_route(
     "mediagoblin.federation.object.comments",
-    "/api/<string:object_type>/<string:id>/comments",
-    "mediagoblin.federation.views:object_comments"
+    "/api/<string:object_type>/<string:id>/comments/",
+    "mediagoblin.federation.views:object_comments",
+    match_slash=False
 )
 
 add_route(
@@ -104,18 +117,21 @@ add_route(
 
 add_route(
     "mediagoblin.webfinger.well-known.webfinger",
-    "/.well-known/webfinger",
-    "mediagoblin.federation.views:lrdd_lookup"
+    "/.well-known/webfinger/",
+    "mediagoblin.federation.views:lrdd_lookup",
+    match_slash=False
 )
 
 add_route(
     "mediagoblin.webfinger.whoami",
-    "/api/whoami",
-    "mediagoblin.federation.views:whoami"
+    "/api/whoami/",
+    "mediagoblin.federation.views:whoami",
+    match_slash=False
 )
 
 add_route(
     "mediagoblin.federation.activity_view",
-    "/<string:username>/activity/<string:id>",
-    "mediagoblin.federation.views:activity_view"
+    "/<string:username>/activity/<string:id>/",
+    "mediagoblin.federation.views:activity_view",
+    match_slash=False
 )