Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity

[akkoma] / lib / pleroma / upload.ex

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 43ebe98e3d709288b572ead2b035c404fa262ff4..9275eff87b78a62196232565b024be61f35a42fe 100644 (file)
--- 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)
@@ -8,23 +10,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/(?<filetype>jpeg|png|gif);base64,(?<data>.*)/, image_data)
+    data = Base.decode64!(parsed["data"])
+    uuid = 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)
+    settings = Application.get_env(:pleroma, Pleroma.Upload)
+    Keyword.fetch!(settings, :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}"
+    "#{Web.base_url()}/media/#{file}"
   end
 end