From f203e7bb4275c1ff1ddf844e4a7eb343e4be2947 Mon Sep 17 00:00:00 2001
From: Lain Soykaf <lain@lain.com>
Date: Thu, 7 Aug 2025 13:51:33 +0400
Subject: [PATCH] EmojiPackController: Refactor.

---
 .../controllers/emoji_pack_controller.ex      | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex b/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
index cc4493cdf..8c5e4c06a 100644
--- a/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
@@ -115,31 +115,23 @@ defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
   end
 
   def download_zip(
-        %{private: %{open_api_spex: %{body_params: %{url: url, name: name}}}} = conn,
+        %{private: %{open_api_spex: %{body_params: params}}} = conn,
         _
       ) do
-    with :ok <- Pack.download_zip(name, %{url: url}) do
-      json(conn, "ok")
-    else
-      {:error, error} ->
-        conn
-        |> put_status(:bad_request)
-        |> json(%{error: error})
-    end
-  end
+    name = Map.get(params, :name)
 
-  def download_zip(
-        %{private: %{open_api_spex: %{body_params: %{file: %Plug.Upload{} = file, name: name}}}} =
-          conn,
-        _
-      ) do
-    with :ok <- Pack.download_zip(name, %{file: file}) do
+    with :ok <- Pack.download_zip(name, params) do
       json(conn, "ok")
     else
-      {:error, error} ->
+      {:error, error} when is_binary(error) ->
         conn
         |> put_status(:bad_request)
         |> json(%{error: error})
+
+      {:error, _} ->
+        conn
+        |> put_status(:bad_request)
+        |> json(%{error: "Could not process pack"})
     end
   end