Revert "Pleroma.Web.PleromaAPI.EmojiPackController: dialyzer errors"
This reverts commit 77bf617c4b
.
This commit is contained in:
parent
4a9ed4682a
commit
b1a6102a85
@ -130,15 +130,15 @@ defmodule Pleroma.Web.ApiSpec.PleromaEmojiPackOperation do
|
|||||||
defp download_request do
|
defp download_request do
|
||||||
%Schema{
|
%Schema{
|
||||||
type: :object,
|
type: :object,
|
||||||
required: ["url", "name"],
|
required: [:url, :name],
|
||||||
properties: %{
|
properties: %{
|
||||||
"url" => %Schema{
|
url: %Schema{
|
||||||
type: :string,
|
type: :string,
|
||||||
format: :uri,
|
format: :uri,
|
||||||
description: "URL of the instance to download from"
|
description: "URL of the instance to download from"
|
||||||
},
|
},
|
||||||
"name" => %Schema{type: :string, format: :uri, description: "Pack Name"},
|
name: %Schema{type: :string, format: :uri, description: "Pack Name"},
|
||||||
"as" => %Schema{type: :string, format: :uri, description: "Save as"}
|
as: %Schema{type: :string, format: :uri, description: "Save as"}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
@ -302,7 +302,27 @@ defmodule Pleroma.Web.ApiSpec.PleromaEmojiPackOperation do
|
|||||||
defp update_request do
|
defp update_request do
|
||||||
%Schema{
|
%Schema{
|
||||||
type: :object,
|
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
|
end
|
||||||
|
|
||||||
|
@ -109,8 +109,8 @@ defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def download(%{body_params: %{"url" => url, "name" => name} = params} = conn, _) do
|
def download(%{body_params: %{url: url, name: name} = params} = conn, _) do
|
||||||
with {:ok, _pack} <- Pack.download(name, url, params["as"]) do
|
with {:ok, _pack} <- Pack.download(name, url, params[:as]) do
|
||||||
json(conn, "ok")
|
json(conn, "ok")
|
||||||
else
|
else
|
||||||
{:error, :not_shareable} ->
|
{:error, :not_shareable} ->
|
||||||
@ -184,7 +184,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
|
|||||||
end
|
end
|
||||||
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
|
with {:ok, pack} <- Pack.update_metadata(name, metadata) do
|
||||||
json(conn, pack.pack)
|
json(conn, pack.pack)
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user