Workaround overlapping URLs.

matrix-org · Dec 20, 2022 · 7f34798 · 7f34798
1 parent be541a9
commit 7f34798
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/synapse/rest/admin/media.py b/synapse/rest/admin/media.py
@@ -482,6 +482,8 @@ def register_servlets_for_media_repo(hs: "HomeServer", http_server: HttpServer)
     ProtectMediaByID(hs).register(http_server)
     UnprotectMediaByID(hs).register(http_server)
     ListMediaInRoom(hs).register(http_server)
-    DeleteMediaByID(hs).register(http_server)
+    # XXX DeleteMediaByDateSize must be registered before DeleteMediaByID as
+    #     their URL routes overlap.
     DeleteMediaByDateSize(hs).register(http_server)
+    DeleteMediaByID(hs).register(http_server)
     UserMediaRestServlet(hs).register(http_server)