Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
9c35456d
Commit
9c35456d
authored
Aug 09, 2017
by
lain
Browse files
URI encode filenames...
parent
9fd86402
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/upload.ex
View file @
9c35456d
...
...
@@ -13,7 +13,7 @@ def store(%Plug.Upload{} = file) do
"url"
=>
[%{
"type"
=>
"Link"
,
"mediaType"
=>
file
.
content_type
,
"href"
=>
url_for
(
Path
.
join
(
uuid
,
file
.
filename
))
"href"
=>
url_for
(
Path
.
join
(
uuid
,
URI
.
encode
(
file
.
filename
))
)
}],
"name"
=>
file
.
filename
,
"uuid"
=>
uuid
...
...
@@ -38,7 +38,7 @@ def store(%{"img" => "data:image/" <> image_data}) do
"url"
=>
[%{
"type"
=>
"Link"
,
"mediaType"
=>
content_type
,
"href"
=>
url_for
(
Path
.
join
(
uuid
,
filename
))
"href"
=>
url_for
(
Path
.
join
(
uuid
,
URI
.
encode
(
filename
))
)
}],
"name"
=>
filename
,
"uuid"
=>
uuid
...
...
test/upload_test.exs
View file @
9c35456d
...
...
@@ -4,9 +4,10 @@ defmodule Pleroma.UploadTest do
describe
"Storing a file"
do
test
"copies the file to the configured folder"
do
file
=
%
Plug
.
Upload
{
content_type:
"image/jpg"
,
path:
Path
.
absname
(
"test/fixtures/image.jpg"
),
filename:
"an
_
image.jpg"
}
file
=
%
Plug
.
Upload
{
content_type:
"image/jpg"
,
path:
Path
.
absname
(
"test/fixtures/image.jpg"
),
filename:
"an
image.jpg"
}
data
=
Upload
.
store
(
file
)
assert
data
[
"name"
]
==
"an_image.jpg"
assert
data
[
"name"
]
==
"an image.jpg"
assert
List
.
first
(
data
[
"url"
])[
"href"
]
==
"http://localhost:4001/media/
#{
data
[
"uuid"
]
}
/an%20image.jpg"
end
end
end
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment