projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'
[akkoma]
/
lib
/
pleroma
/
upload.ex
diff --git
a/lib/pleroma/upload.ex
b/lib/pleroma/upload.ex
index 2a48331d7d3f558e707d3da3ea45c5f53e0dc530..91a5db8c524f6e24b4b122c267cc5afd0a7c1a38 100644
(file)
--- a/
lib/pleroma/upload.ex
+++ b/
lib/pleroma/upload.ex
@@
-124,10
+124,10
@@
defmodule Pleroma.Upload do
:pleroma, Pleroma.Upload, [filters: [Pleroma.Upload.Filter.Mogrify]]
:pleroma, Pleroma.Upload, [filters: [Pleroma.Upload.Filter.Mogrify]]
- :pleroma, Pleroma.Upload.Filter.Mogrify, args:
"strip"
+ :pleroma, Pleroma.Upload.Filter.Mogrify, args:
["strip", "auto-orient"]
""")
""")
- Pleroma.Config.put([Pleroma.Upload.Filter.Mogrify], args:
"strip"
)
+ Pleroma.Config.put([Pleroma.Upload.Filter.Mogrify], args:
["strip", "auto-orient"]
)
Map.put(opts, :filters, opts.filters ++ [Pleroma.Upload.Filter.Mogrify])
else
opts
Map.put(opts, :filters, opts.filters ++ [Pleroma.Upload.Filter.Mogrify])
else
opts
@@
-180,7
+180,7
@@
defmodule Pleroma.Upload do
end
# For Mix.Tasks.MigrateLocalUploads
end
# For Mix.Tasks.MigrateLocalUploads
- defp prepare_upload(
upload = %__MODULE__{tempfile: path}
, _opts) do
+ defp prepare_upload(
%__MODULE__{tempfile: path} = upload
, _opts) do
with {:ok, content_type} <- Pleroma.MIME.file_mime_type(path) do
{:ok, %__MODULE__{upload | content_type: content_type}}
end
with {:ok, content_type} <- Pleroma.MIME.file_mime_type(path) do
{:ok, %__MODULE__{upload | content_type: content_type}}
end
@@
-216,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