From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Sun, 5 Jul 2020 16:02:43 +0000 (+0300)
Subject: [#2497] Fixed merge issue.
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;ds=sidebyside;h=9faa63203717e71d666afb6755ff0b781b491823;p=akkoma

[#2497] Fixed merge issue.
---

diff --git a/lib/pleroma/web/media_proxy/media_proxy_controller.ex b/lib/pleroma/web/media_proxy/media_proxy_controller.ex
index 0f4575e2f..583c177f2 100644
--- a/lib/pleroma/web/media_proxy/media_proxy_controller.ex
+++ b/lib/pleroma/web/media_proxy/media_proxy_controller.ex
@@ -12,8 +12,8 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
 
   def remote(conn, %{"sig" => sig64, "url" => url64}) do
     with {_, true} <- {:enabled, MediaProxy.enabled?()},
-         {_, false} <- {:in_banned_urls, MediaProxy.in_banned_urls(url)},
          {:ok, url} <- MediaProxy.decode_url(sig64, url64),
+         {_, false} <- {:in_banned_urls, MediaProxy.in_banned_urls(url)},
          :ok <- MediaProxy.verify_request_path_and_url(conn, url) do
       proxy_opts = Config.get([:media_proxy, :proxy_opts], [])
       ReverseProxy.call(conn, url, proxy_opts)