projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '582_federation_retirement_optimization' into 'develop'
[akkoma]
/
lib
/
pleroma
/
upload.ex
diff --git
a/lib/pleroma/upload.ex
b/lib/pleroma/upload.ex
index 185ba25fa15effd4b85e98c675d9be4823bb0a26..0a19e737bbd18d77377eb5857291c08bded1c65f 100644
(file)
--- a/
lib/pleroma/upload.ex
+++ b/
lib/pleroma/upload.ex
@@
-34,8
+34,9
@@
defmodule Pleroma.Upload do
require Logger
@type source ::
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}
@type option ::
{:type, :avatar | :banner | :background}
@@
-215,7
+216,13
@@
defmodule Pleroma.Upload do
end
defp url_from_spec(base_url, {:file, path}) 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
|> Path.join()
end