summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-05-22 15:04:05 -0500
committerAlex Gleason <alex@alexgleason.me>2021-05-22 15:04:39 -0500
commit42119b9c1c7451d3dd093291a0d24d8f11f9fd33 (patch)
treed4bb5e865b3fd9b87edf4934ec5be4a4b1fc4790
parentaa5e29331970e7c1246ed37777d4aeee0b86ed47 (diff)
Cycles: Don't make MediaProxy be a compile-dep of Router
Breaks cycles in lib/pleroma/web/media_proxy.ex
-rw-r--r--lib/pleroma/web/router.ex10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 3550088bb..14b8b5bc6 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -764,11 +764,11 @@ defmodule Pleroma.Web.Router do
get("/embed/:id", EmbedController, :show)
end
- scope "/proxy/", Pleroma.Web.MediaProxy do
- get("/preview/:sig/:url", MediaProxyController, :preview)
- get("/preview/:sig/:url/:filename", MediaProxyController, :preview)
- get("/:sig/:url", MediaProxyController, :remote)
- get("/:sig/:url/:filename", MediaProxyController, :remote)
+ scope "/proxy/", Pleroma.Web do
+ get("/preview/:sig/:url", MediaProxy.MediaProxyController, :preview)
+ get("/preview/:sig/:url/:filename", MediaProxy.MediaProxyController, :preview)
+ get("/:sig/:url", MediaProxy.MediaProxyController, :remote)
+ get("/:sig/:url/:filename", MediaProxy.MediaProxyController, :remote)
end
if Pleroma.Config.get(:env) == :dev do