Merge branch 'bugfix/get_list_return_404' into 'develop'

[akkoma] / lib / pleroma / upload.ex

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 2a48331d7d3f558e707d3da3ea45c5f53e0dc530..0a19e737bbd18d77377eb5857291c08bded1c65f 100644 (file)
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -216,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