X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fupload.ex;h=2717377a37f4f6d1c1379fb80f6e225563742601;hb=2b21c05105d550d09d85807246be696a1aed4b32;hp=3aabf81574714bf0721116856d2318e277b44efe;hpb=85bd480be333896ca9cc0ade0e68ea99e10aaaa7;p=akkoma

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 3aabf8157..2717377a3 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -1,6 +1,8 @@
 defmodule Pleroma.Upload do
+  alias Ecto.UUID
+  alias Pleroma.Web
   def store(%Plug.Upload{} = file) do
-    uuid = Ecto.UUID.generate
+    uuid = UUID.generate
     upload_folder = Path.join(upload_path(), uuid)
     File.mkdir_p!(upload_folder)
     result_file = Path.join(upload_folder, file.filename)
@@ -11,7 +13,7 @@ defmodule Pleroma.Upload do
       "url" => [%{
         "type" => "Link",
         "mediaType" => file.content_type,
-        "href" => url_for(Path.join(uuid, file.filename))
+        "href" => url_for(Path.join(uuid, :cow_uri.urlencode(file.filename)))
       }],
       "name" => file.filename,
       "uuid" => uuid
@@ -21,7 +23,7 @@ defmodule Pleroma.Upload do
   def store(%{"img" => "data:image/" <> image_data}) do
     parsed = Regex.named_captures(~r/(?<filetype>jpeg|png|gif);base64,(?<data>.*)/, image_data)
     data = Base.decode64!(parsed["data"])
-    uuid = Ecto.UUID.generate
+    uuid = UUID.generate
     upload_folder = Path.join(upload_path(), uuid)
     File.mkdir_p!(upload_folder)
     filename = Base.encode16(:crypto.hash(:sha256, data)) <> ".#{parsed["filetype"]}"
@@ -36,7 +38,7 @@ defmodule Pleroma.Upload do
       "url" => [%{
         "type" => "Link",
         "mediaType" => content_type,
-        "href" => url_for(Path.join(uuid, filename))
+        "href" => url_for(Path.join(uuid, :cow_uri.urlencode(filename)))
       }],
       "name" => filename,
       "uuid" => uuid
@@ -44,11 +46,11 @@ defmodule Pleroma.Upload do
   end
 
   defp upload_path do
-    Application.get_env(:pleroma, Pleroma.Upload)
-    |> Keyword.fetch!(:uploads)
+    settings = Application.get_env(:pleroma, Pleroma.Upload)
+    Keyword.fetch!(settings, :uploads)
   end
 
   defp url_for(file) do
-    "#{Pleroma.Web.base_url()}/media/#{file}"
+    "#{Web.base_url()}/media/#{file}"
   end
 end