X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fupload.ex;h=0a19e737bbd18d77377eb5857291c08bded1c65f;hb=b40b4bc4e5b49ac2b35746cee7b1db92428d3ee1;hp=185ba25fa15effd4b85e98c675d9be4823bb0a26;hpb=f20bfc9ea5059735c02f8a7260733bc7efbc90bd;p=akkoma

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 185ba25fa..0a19e737b 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -34,8 +34,9 @@ defmodule Pleroma.Upload do
   require Logger
 
   @type source ::
-          Plug.Upload.t() | data_uri_string ::
-          String.t() | {:from_local, name :: String.t(), id :: String.t(), path :: String.t()}
+          Plug.Upload.t()
+          | (data_uri_string :: String.t())
+          | {:from_local, name :: String.t(), id :: String.t(), path :: String.t()}
 
   @type option ::
           {:type, :avatar | :banner | :background}
@@ -215,7 +216,13 @@ defmodule Pleroma.Upload do
   end
 
   defp url_from_spec(base_url, {:file, path}) do
-    [base_url, "media", URI.encode(path)]
+    path =
+      path
+      |> URI.encode()
+      |> String.replace("?", "%3F")
+      |> String.replace(":", "%3A")
+
+    [base_url, "media", path]
     |> Path.join()
   end