Allow uploading new emojis to packs from URLs

lib/pleroma/web/emoji_api/emoji_api_controller.ex

@@ -288,14 +288,14 @@ keeping it in cache for #{div(cache_ms, 1000)}s")
       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
+                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
@@ -307,9 +307,17 @@ keeping it in cache for #{div(cache_ms, 1000)}s")
                 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}
@@ -319,9 +327,6 @@ keeping it in cache for #{div(cache_ms, 1000)}s")
                |> put_status(:bad_request)
                |> text("shortcode or filename cannot be empty")}
             end
-            else
-              _ -> {:error, conn |> put_status(:bad_request) |> text("\"file\" not provided")}
-            end
           else
             {:error,
              conn

test/web/emoji_api_controller_test.exs

@@ -244,6 +244,7 @@ defmodule Pleroma.Web.EmojiAPI.EmojiAPIControllerTest 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 @@ defmodule Pleroma.Web.EmojiAPI.EmojiAPIControllerTest 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