X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fupload.ex;h=3aabf81574714bf0721116856d2318e277b44efe;hb=4649ba2d627ab1c42e9067d0af783ae05ac8ae11;hp=43ebe98e3d709288b572ead2b035c404fa262ff4;hpb=08fdbd6f3ab15ac8312073d832324516b723b81a;p=akkoma diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex index 43ebe98e3..3aabf8157 100644 --- a/lib/pleroma/upload.ex +++ b/lib/pleroma/upload.ex @@ -8,23 +8,47 @@ defmodule Pleroma.Upload do %{ "type" => "Image", - "href" => url_for(Path.join(uuid, file.filename)), + "url" => [%{ + "type" => "Link", + "mediaType" => file.content_type, + "href" => url_for(Path.join(uuid, file.filename)) + }], "name" => file.filename, "uuid" => uuid } end + def store(%{"img" => "data:image/" <> image_data}) do + parsed = Regex.named_captures(~r/(?jpeg|png|gif);base64,(?.*)/, image_data) + data = Base.decode64!(parsed["data"]) + uuid = Ecto.UUID.generate + upload_folder = Path.join(upload_path(), uuid) + File.mkdir_p!(upload_folder) + filename = Base.encode16(:crypto.hash(:sha256, data)) <> ".#{parsed["filetype"]}" + result_file = Path.join(upload_folder, filename) + + File.write!(result_file, data) + + content_type = "image/#{parsed["filetype"]}" + + %{ + "type" => "Image", + "url" => [%{ + "type" => "Link", + "mediaType" => content_type, + "href" => url_for(Path.join(uuid, filename)) + }], + "name" => filename, + "uuid" => uuid + } + end + defp upload_path do Application.get_env(:pleroma, Pleroma.Upload) |> Keyword.fetch!(:uploads) end defp url_for(file) do - host = - Application.get_env(:pleroma, Pleroma.Web.Endpoint) - |> Keyword.fetch!(:url) - |> Keyword.fetch!(:host) - - "https://#{host}/media/#{file}" + "#{Pleroma.Web.base_url()}/media/#{file}" end end