From 8b02c858102232700826214ffb5d58e5b2f90edf Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Sat, 27 Jan 2024 15:41:14 -0500 Subject: [PATCH] Pleroma.Web.AdminAPI.MediaProxyCacheController: dialyzer errors lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex:64:call The function call will not succeed. Phoenix.Controller.json( _conn :: %{ :assigns => %{:user => _, _ => _}, :body_params => %{:urls => _, _ => _}, _ => _ }, %{} ) breaks the contract (Plug.Conn.t(), term()) :: Plug.Conn.t() --- .../controllers/media_proxy_cache_controller.ex | 4 ++-- .../operations/admin/media_proxy_cache_operation.ex | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex b/lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex index 4d53f5451..c615422cd 100644 --- a/lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/media_proxy_cache_controller.ex @@ -59,12 +59,12 @@ defmodule Pleroma.Web.AdminAPI.MediaProxyCacheController do Enum.slice(entries, offset, page_size) end - def delete(%{assigns: %{user: _}, body_params: %{urls: urls}} = conn, _) do + def delete(%{assigns: %{user: _}, body_params: %{"urls" => urls}} = conn, _) do MediaProxy.remove_from_banned_urls(urls) json(conn, %{}) end - def purge(%{assigns: %{user: _}, body_params: %{urls: urls, ban: ban}} = conn, _) do + def purge(%{assigns: %{user: _}, body_params: %{"urls" => urls, "ban" => ban}} = conn, _) do MediaProxy.Invalidation.purge(urls) if ban do diff --git a/lib/pleroma/web/api_spec/operations/admin/media_proxy_cache_operation.ex b/lib/pleroma/web/api_spec/operations/admin/media_proxy_cache_operation.ex index 0b1eb3946..79363d4cd 100644 --- a/lib/pleroma/web/api_spec/operations/admin/media_proxy_cache_operation.ex +++ b/lib/pleroma/web/api_spec/operations/admin/media_proxy_cache_operation.ex @@ -78,9 +78,9 @@ defmodule Pleroma.Web.ApiSpec.Admin.MediaProxyCacheOperation do "Parameters", %Schema{ type: :object, - required: [:urls], + required: ["urls"], properties: %{ - urls: %Schema{type: :array, items: %Schema{type: :string, format: :uri}} + "urls" => %Schema{type: :array, items: %Schema{type: :string, format: :uri}} } }, required: true @@ -104,10 +104,10 @@ defmodule Pleroma.Web.ApiSpec.Admin.MediaProxyCacheOperation do "Parameters", %Schema{ type: :object, - required: [:urls], + required: ["urls"], properties: %{ - urls: %Schema{type: :array, items: %Schema{type: :string, format: :uri}}, - ban: %Schema{type: :boolean, default: true} + "urls" => %Schema{type: :array, items: %Schema{type: :string, format: :uri}}, + "ban" => %Schema{type: :boolean, default: true} } }, required: true