pleroma

commit: b1a6102a85a73f5ce0ab620660488a7d379ab2b6
parent 4a9ed4682ab292232637ceb39819bbd7d266926e
Author: Mark Felder <feld@feld.me>
Date:   Tue, 30 Jan 2024 14:15:40 -0500

Revert "Pleroma.Web.PleromaAPI.EmojiPackController: dialyzer errors"

This reverts commit 77bf617c4b28fce84f268ca391fa4af6dd590c82.

Diffstat:
M
lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
30
+++++++++++++++++++++++++-----
M
lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
6
+++---

2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex b/lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
@@ -130,15 +130,15 @@ defmodule Pleroma.Web.ApiSpec.PleromaEmojiPackOperation do
   defp download_request do
     %Schema{
       type: :object,
-      required: ["url", "name"],
+      required: [:url, :name],
       properties: %{
-        "url" => %Schema{
+        url: %Schema{
           type: :string,
           format: :uri,
           description: "URL of the instance to download from"
         },
-        "name" => %Schema{type: :string, format: :uri, description: "Pack Name"},
-        "as" => %Schema{type: :string, format: :uri, description: "Save as"}
+        name: %Schema{type: :string, format: :uri, description: "Pack Name"},
+        as: %Schema{type: :string, format: :uri, description: "Save as"}
       }
     }
   end
@@ -302,7 +302,27 @@ defmodule Pleroma.Web.ApiSpec.PleromaEmojiPackOperation do
   defp update_request do
     %Schema{
       type: :object,
-      properties: %{"metadata" => metadata()}
+      properties: %{
+        metadata: %Schema{
+          type: :object,
+          description: "Metadata to replace the old one",
+          properties: %{
+            license: %Schema{type: :string},
+            homepage: %Schema{type: :string, format: :uri},
+            description: %Schema{type: :string},
+            "fallback-src": %Schema{
+              type: :string,
+              format: :uri,
+              description: "Fallback url to download pack from"
+            },
+            "fallback-src-sha256": %Schema{
+              type: :string,
+              description: "SHA256 encoded for fallback pack archive"
+            },
+            "share-files": %Schema{type: :boolean, description: "Is pack allowed for sharing?"}
+          }
+        }
+      }
     }
   end
 
diff --git a/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex b/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
@@ -109,8 +109,8 @@ defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
     end
   end
 
-  def download(%{body_params: %{"url" => url, "name" => name} = params} = conn, _) do
-    with {:ok, _pack} <- Pack.download(name, url, params["as"]) do
+  def download(%{body_params: %{url: url, name: name} = params} = conn, _) do
+    with {:ok, _pack} <- Pack.download(name, url, params[:as]) do
       json(conn, "ok")
     else
       {:error, :not_shareable} ->
@@ -184,7 +184,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
     end
   end
 
-  def update(%{body_params: %{"metadata" => metadata}} = conn, %{name: name}) do
+  def update(%{body_params: %{metadata: metadata}} = conn, %{name: name}) do
     with {:ok, pack} <- Pack.update_metadata(name, metadata) do
       json(conn, pack.pack)
     else