Merge branch 'bugfix/upload_with_question_mark' into 'develop'

Upload: Fix uploading with a ? in the filename

See merge request pleroma/pleroma!669

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 185ba25fa..b19920dff 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -215,7 +215,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