logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 1e76ceacd53325fdb5a6483d3d42926d6579d3cc
parent 2c8e4f32c60793aba3e048f4d1c2b30186eb22af
Author: Mark Felder <feld@feld.me>
Date:   Tue, 30 Jan 2024 14:19:13 -0500

Revert "Pleroma.Web.AdminAPI.ConfigController: dialyzer error"

This reverts commit 60d89cb40455f9f70b683849dd95311975b0b6f7.

Diffstat:

Mlib/pleroma/web/admin_api/controllers/config_controller.ex2+-
Mlib/pleroma/web/api_spec/operations/admin/config_operation.ex2+-
Mtest/pleroma/web/admin_api/controllers/config_controller_test.exs4++--
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/pleroma/web/admin_api/controllers/config_controller.ex b/lib/pleroma/web/admin_api/controllers/config_controller.ex @@ -128,7 +128,7 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do end end - def update(%{body_params: %{"configs" => configs}} = conn, _) do + def update(%{body_params: %{configs: configs}} = conn, _) do with :ok <- configurable_from_database() do results = configs diff --git a/lib/pleroma/web/api_spec/operations/admin/config_operation.ex b/lib/pleroma/web/api_spec/operations/admin/config_operation.ex @@ -47,7 +47,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.ConfigOperation do request_body("Parameters", %Schema{ type: :object, properties: %{ - "configs" => %Schema{ + configs: %Schema{ type: :array, items: %Schema{ type: :object, diff --git a/test/pleroma/web/admin_api/controllers/config_controller_test.exs b/test/pleroma/web/admin_api/controllers/config_controller_test.exs @@ -873,7 +873,7 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do %{ "tuple" => [ ":_", - "Plug.Cowboy.Handler", + "Phoenix.Endpoint.Cowboy2Handler", %{"tuple" => ["Pleroma.Web.Endpoint", []]} ] } @@ -937,7 +937,7 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do %{ "tuple" => [ ":_", - "Plug.Cowboy.Handler", + "Phoenix.Endpoint.Cowboy2Handler", %{"tuple" => ["Pleroma.Web.Endpoint", []]} ] }