From 8dbdd5c280d15fde4712989001d4ddee1cd37cff Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Tue, 20 Aug 2019 14:52:36 +0300
Subject: [PATCH] Allow uploading new emojis to packs from URLs

---
 .../web/emoji_api/emoji_api_controller.ex     | 65 ++++++++++---------
 test/web/emoji_api_controller_test.exs        | 34 ++++++++++
 2 files changed, 69 insertions(+), 30 deletions(-)

diff --git a/lib/pleroma/web/emoji_api/emoji_api_controller.ex b/lib/pleroma/web/emoji_api/emoji_api_controller.ex
index fdecbb700..87ae0e092 100644
--- a/lib/pleroma/web/emoji_api/emoji_api_controller.ex
+++ b/lib/pleroma/web/emoji_api/emoji_api_controller.ex
@@ -288,39 +288,44 @@ def update_file(
       case action do
         "add" ->
           unless Map.has_key?(full_pack["files"], shortcode) do
-            with %{"file" => %Plug.Upload{filename: filename, path: upload_path}} <- params do
-              # If there was a file name provided with the request, use it, otherwise just use the
-              # uploaded file name
-              filename =
-                if Map.has_key?(params, "filename") do
-                  params["filename"]
-                else
-                  filename
-                end
-
-              unless String.trim(shortcode) |> String.length() == 0 or
-                       String.trim(filename) |> String.length() == 0 do
-                file_path = Path.join(pack_dir, filename)
-
-                # If the name contains directories, create them
-                if String.contains?(file_path, "/") do
-                  File.mkdir_p!(Path.dirname(file_path))
-                end
-
-                # Copy the uploaded file from the temporary directory
-                File.copy!(upload_path, file_path)
-
-                updated_full_pack = put_in(full_pack, ["files", shortcode], filename)
-
-                {:ok, updated_full_pack}
+            filename =
+              if Map.has_key?(params, "filename") do
+                params["filename"]
               else
-                {:error,
-                 conn
-                 |> put_status(:bad_request)
-                 |> text("shortcode or filename cannot be empty")}
+                case params["file"] do
+                  %Plug.Upload{filename: filename} -> filename
+                  url when is_binary(url) -> Path.basename(url)
+                end
               end
+
+            unless String.trim(shortcode) |> String.length() == 0 or
+                     String.trim(filename) |> String.length() == 0 do
+              file_path = Path.join(pack_dir, filename)
+
+              # If the name contains directories, create them
+              if String.contains?(file_path, "/") do
+                File.mkdir_p!(Path.dirname(file_path))
+              end
+
+              case params["file"] do
+                %Plug.Upload{path: upload_path} ->
+                  # Copy the uploaded file from the temporary directory
+                  File.copy!(upload_path, file_path)
+
+                url when is_binary(url) ->
+                  # Download and write the file
+                  file_contents = Tesla.get!(url).body
+                  File.write!(file_path, file_contents)
+              end
+
+              updated_full_pack = put_in(full_pack, ["files", shortcode], filename)
+
+              {:ok, updated_full_pack}
             else
-              _ -> {:error, conn |> put_status(:bad_request) |> text("\"file\" not provided")}
+              {:error,
+               conn
+               |> put_status(:bad_request)
+               |> text("shortcode or filename cannot be empty")}
             end
           else
             {:error,
diff --git a/test/web/emoji_api_controller_test.exs b/test/web/emoji_api_controller_test.exs
index 6d3603da5..c1aece691 100644
--- a/test/web/emoji_api_controller_test.exs
+++ b/test/web/emoji_api_controller_test.exs
@@ -244,6 +244,7 @@ test "updating pack files" do
     on_exit(fn ->
       File.write!(pack_file, original_content)
 
+      File.rm_rf!("#{@emoji_dir_path}/test_pack/blank_url.png")
       File.rm_rf!("#{@emoji_dir_path}/test_pack/dir")
       File.rm_rf!("#{@emoji_dir_path}/test_pack/dir_2")
     end)
@@ -296,5 +297,38 @@ test "updating pack files" do
            |> json_response(200) == %{"blank" => "blank.png"}
 
     refute File.exists?("#{@emoji_dir_path}/test_pack/dir_2/")
+
+    mock(fn
+      %{
+        method: :get,
+        url: "https://test-blank/blank_url.png"
+      } ->
+        text(File.read!("#{@emoji_dir_path}/test_pack/blank.png"))
+    end)
+
+    # The name should be inferred from the URL ending
+    from_url = %{
+      "action" => "add",
+      "shortcode" => "blank_url",
+      "file" => "https://test-blank/blank_url.png"
+    }
+
+    assert conn
+           |> post(emoji_api_path(conn, :update_file, "test_pack"), from_url)
+           |> json_response(200) == %{
+             "blank" => "blank.png",
+             "blank_url" => "blank_url.png"
+           }
+
+    assert File.exists?("#{@emoji_dir_path}/test_pack/blank_url.png")
+
+    assert conn
+           |> post(emoji_api_path(conn, :update_file, "test_pack"), %{
+             "action" => "remove",
+             "shortcode" => "blank_url"
+           })
+           |> json_response(200) == %{"blank" => "blank.png"}
+
+    refute File.exists?("#{@emoji_dir_path}/test_pack/blank_url.png")
   end
 end