commit: d92c3d927d4134941dabef3e8f1b5209de115665
parent db87be126e707ffc84c0b6b598aa07a4b068e82a
Author: Mark Felder <feld@feld.me>
Date: Sun, 28 Jan 2024 16:05:25 -0500
Pleroma.Web.AdminAPI.UserController: dialyzer errors
lib/pleroma/web/admin_api/controllers/user_controller.ex:54:no_return
Function delete/2 has no local return.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:74:call
The function call will not succeed.
Phoenix.Controller.json(
_conn :: %{
:assigns => %{:user => _, _ => _},
:body_params => %{:nicknames => _, _ => _},
_ => _
},
_nicknames :: any()
)
breaks the contract
(Plug.Conn.t(), term()) :: Plug.Conn.t()
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:77:no_return
Function follow/2 has no local return.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:99:call
The function call will not succeed.
Phoenix.Controller.json(
_conn :: %{
:assigns => %{:user => _, _ => _},
:body_params => %{:followed => _, :follower => _, _ => _},
_ => _
},
<<111, 107>>
)
breaks the contract
(Plug.Conn.t(), term()) :: Plug.Conn.t()
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:102:no_return
Function unfollow/2 has no local return.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:124:call
The function call will not succeed.
Phoenix.Controller.json(
_conn :: %{
:assigns => %{:user => _, _ => _},
:body_params => %{:followed => _, :follower => _, _ => _},
_ => _
},
<<111, 107>>
)
breaks the contract
(Plug.Conn.t(), term()) :: Plug.Conn.t()
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:127:no_return
Function create/2 has no local return.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:130:no_return
The created anonymous function has no local return.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:163:call
The function call will not succeed.
Phoenix.Controller.render(
_conn :: %{
:assigns => %{:user => _, _ => _},
:body_params => %{:users => _, _ => _},
_ => _
},
<<99, 114, 101, 97, 116, 101, 100, 95, 109, 97, 110, 121, 46, 106, 115, 111, 110>>,
[{:users, [any()]}, ...]
)
will never return since the success typing is:
(
%Plug.Conn{
:adapter => {atom(), _},
:assigns => %{atom() => _},
:body_params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:halted => boolean(),
:host => binary(),
:method => binary(),
:owner => pid(),
:params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:path_info => [binary()],
:path_params => %{binary() => binary() | [any()] | map()},
:port => char(),
:private => %{atom() => _},
:query_params => %Plug.Conn.Unfetched{
:aspect => atom(),
binary() => binary() | [any()] | map()
},
:query_string => binary(),
:remote_ip =>
{byte(), byte(), byte(), byte()}
| {char(), char(), char(), char(), char(), char(), char(), char()},
:req_cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => binary()},
:req_headers => [{_, _}],
:request_path => binary(),
:resp_body =>
nil
| binary()
| maybe_improper_list(
binary() | maybe_improper_list(any(), binary() | []) | byte(),
binary() | []
),
:resp_cookies => %{binary() => map()},
:resp_headers => [{_, _}],
:scheme => :http | :https,
:script_name => [binary()],
:secret_key_base => nil | binary(),
:state =>
:chunked | :file | :sent | :set | :set_chunked | :set_file | :unset | :upgraded,
:status => nil | non_neg_integer()
},
atom() | binary(),
atom() | binary() | [{_, _}] | map()
) :: %Plug.Conn{
:adapter => {atom(), _},
:assigns => %{atom() => _},
:body_params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:halted => boolean(),
:host => binary(),
:method => binary(),
:owner => pid(),
:params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:path_info => [binary()],
:path_params => %{binary() => binary() | [any()] | map()},
:port => char(),
:private => %{atom() => _},
:query_params => %Plug.Conn.Unfetched{
:aspect => atom(),
binary() => binary() | [any()] | map()
},
:query_string => binary(),
:remote_ip =>
{byte(), byte(), byte(), byte()}
| {char(), char(), char(), char(), char(), char(), char(), char()},
:req_cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => binary()},
:req_headers => [{_, _}],
:request_path => binary(),
:resp_body =>
nil
| binary()
| maybe_improper_list(
binary() | maybe_improper_list(any(), binary() | []) | byte(),
binary() | []
),
:resp_cookies => %{binary() => map()},
:resp_headers => [{_, _}],
:scheme => :http | :https,
:script_name => [binary()],
:secret_key_base => nil | binary(),
:state => :sent,
:status => nil | non_neg_integer()
}
and the contract is
(Plug.Conn.t(), binary() | atom(), Keyword.t() | map()) :: Plug.Conn.t()
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:175:call
The function call will not succeed.
Plug.Conn.put_status(
_conn :: %{
:assigns => %{:user => _, _ => _},
:body_params => %{:users => _, _ => _},
_ => _
},
:conflict
)
breaks the contract
(t(), status()) :: t()
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:205:no_return
Function activate/2 has no local return.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:215:call
The function call will not succeed.
Keyword.values(
_updated_users :: %Pleroma.User{
:__meta__ => _,
:accepts_chat_messages => _,
:actor_type => _,
:allow_following_move => _,
:also_known_as => _,
:ap_id => _,
:avatar => _,
:background => _,
:banner => _,
:bio => _,
:birthday => _,
:blocked_users => _,
:blockee_blocks => _,
:blocker_blocks => _,
:blocker_users => _,
:blocks => _,
:confirmation_token => _,
:default_scope => _,
:deliveries => _,
:disclose_client => _,
:domain_blocks => _,
:email => _,
:email_notifications => _,
:emoji => _,
:endorsed_users => _,
:endorsee_endorsements => _,
:endorser_endorsements => _,
:endorser_users => _,
:featured_address => _,
:fields => _,
:follower_address => _,
:follower_count => _,
:following_address => _,
:following_count => _,
:hide_favorites => _,
:hide_followers => _,
:hide_followers_count => _,
:hide_follows => _,
:hide_follows_count => _,
:id => _,
:inbox => _,
:incoming_relationships => _,
:inserted_at => _,
:invisible => _,
:is_active => _,
:is_admin => _,
:is_approved => _,
:is_confirmed => _,
:is_discoverable => _,
:is_locked => _,
:is_moderator => _,
:is_suggested => _,
:keys => _,
:language => _,
:last_active_at => _,
:last_digest_emailed_at => _,
:last_refreshed_at => _,
:last_status_at => _,
:local => _,
:mascot => _,
:multi_factor_authentication_settings => _,
:muted_notifications => _,
:muted_reblogs => _,
:muted_users => _,
:mutee_mutes => _,
:muter_mutes => _,
:muter_users => _,
:mutes => _,
:name => _,
:nickname => _,
:no_rich_text => _,
:note_count => _,
:notification_muted_users => _,
:notification_mutee_mutes => _,
:notification_muter_mutes => _,
:notification_muter_users => _,
:notification_settings => _,
:notifications => _,
:outgoing_relationships => _,
:password => _,
:password_confirmation => _,
:password_hash => _,
:password_reset_pending => _,
:pinned_objects => _,
:pleroma_settings_store => _,
:public_key => _,
:raw_bio => _,
:raw_fields => _,
:reblog_muted_users => _,
:reblog_mutee_mutes => _,
:reblog_muter_mutes => _,
:reblog_muter_users => _,
:registration_reason => _,
:registrations => _,
:search_rank => _,
:search_type => _,
:shared_inbox => _,
:show_birthday => _,
:show_role => _,
:skip_thread_containment => _,
:subscribee_subscriptions => _,
:subscribee_users => _,
:subscriber_subscriptions => _,
:subscriber_users => _,
:subscribers => _,
:tags => _,
:updated_at => _,
:uri => _
}
)
will never return since the success typing is:
([any()]) :: [any()]
and the contract is
(t()) :: [value()]
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:218:no_return
Function deactivate/2 has no local return.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:228:call
The function call will not succeed.
Keyword.values(
_updated_users :: %Pleroma.User{
:__meta__ => _,
:accepts_chat_messages => _,
:actor_type => _,
:allow_following_move => _,
:also_known_as => _,
:ap_id => _,
:avatar => _,
:background => _,
:banner => _,
:bio => _,
:birthday => _,
:blocked_users => _,
:blockee_blocks => _,
:blocker_blocks => _,
:blocker_users => _,
:blocks => _,
:confirmation_token => _,
:default_scope => _,
:deliveries => _,
:disclose_client => _,
:domain_blocks => _,
:email => _,
:email_notifications => _,
:emoji => _,
:endorsed_users => _,
:endorsee_endorsements => _,
:endorser_endorsements => _,
:endorser_users => _,
:featured_address => _,
:fields => _,
:follower_address => _,
:follower_count => _,
:following_address => _,
:following_count => _,
:hide_favorites => _,
:hide_followers => _,
:hide_followers_count => _,
:hide_follows => _,
:hide_follows_count => _,
:id => _,
:inbox => _,
:incoming_relationships => _,
:inserted_at => _,
:invisible => _,
:is_active => _,
:is_admin => _,
:is_approved => _,
:is_confirmed => _,
:is_discoverable => _,
:is_locked => _,
:is_moderator => _,
:is_suggested => _,
:keys => _,
:language => _,
:last_active_at => _,
:last_digest_emailed_at => _,
:last_refreshed_at => _,
:last_status_at => _,
:local => _,
:mascot => _,
:multi_factor_authentication_settings => _,
:muted_notifications => _,
:muted_reblogs => _,
:muted_users => _,
:mutee_mutes => _,
:muter_mutes => _,
:muter_users => _,
:mutes => _,
:name => _,
:nickname => _,
:no_rich_text => _,
:note_count => _,
:notification_muted_users => _,
:notification_mutee_mutes => _,
:notification_muter_mutes => _,
:notification_muter_users => _,
:notification_settings => _,
:notifications => _,
:outgoing_relationships => _,
:password => _,
:password_confirmation => _,
:password_hash => _,
:password_reset_pending => _,
:pinned_objects => _,
:pleroma_settings_store => _,
:public_key => _,
:raw_bio => _,
:raw_fields => _,
:reblog_muted_users => _,
:reblog_mutee_mutes => _,
:reblog_muter_mutes => _,
:reblog_muter_users => _,
:registration_reason => _,
:registrations => _,
:search_rank => _,
:search_type => _,
:shared_inbox => _,
:show_birthday => _,
:show_role => _,
:skip_thread_containment => _,
:subscribee_subscriptions => _,
:subscribee_users => _,
:subscriber_subscriptions => _,
:subscriber_users => _,
:subscribers => _,
:tags => _,
:updated_at => _,
:uri => _
}
)
will never return since the success typing is:
([any()]) :: [any()]
and the contract is
(t()) :: [value()]
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:231:no_return
Function approve/2 has no local return.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:241:call
The function call will not succeed.
Phoenix.Controller.render(
_conn :: %{
:assigns => %{:user => _, _ => _},
:body_params => %{:nicknames => _, _ => _},
_ => _
},
<<105, 110, 100, 101, 120, 46, 106, 115, 111, 110>>,
[{:users, _}, ...]
)
will never return since the success typing is:
(
%Plug.Conn{
:adapter => {atom(), _},
:assigns => %{atom() => _},
:body_params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:halted => boolean(),
:host => binary(),
:method => binary(),
:owner => pid(),
:params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:path_info => [binary()],
:path_params => %{binary() => binary() | [any()] | map()},
:port => char(),
:private => %{atom() => _},
:query_params => %Plug.Conn.Unfetched{
:aspect => atom(),
binary() => binary() | [any()] | map()
},
:query_string => binary(),
:remote_ip =>
{byte(), byte(), byte(), byte()}
| {char(), char(), char(), char(), char(), char(), char(), char()},
:req_cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => binary()},
:req_headers => [{_, _}],
:request_path => binary(),
:resp_body =>
nil
| binary()
| maybe_improper_list(
binary() | maybe_improper_list(any(), binary() | []) | byte(),
binary() | []
),
:resp_cookies => %{binary() => map()},
:resp_headers => [{_, _}],
:scheme => :http | :https,
:script_name => [binary()],
:secret_key_base => nil | binary(),
:state =>
:chunked | :file | :sent | :set | :set_chunked | :set_file | :unset | :upgraded,
:status => nil | non_neg_integer()
},
atom() | binary(),
atom() | binary() | [{_, _}] | map()
) :: %Plug.Conn{
:adapter => {atom(), _},
:assigns => %{atom() => _},
:body_params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:halted => boolean(),
:host => binary(),
:method => binary(),
:owner => pid(),
:params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:path_info => [binary()],
:path_params => %{binary() => binary() | [any()] | map()},
:port => char(),
:private => %{atom() => _},
:query_params => %Plug.Conn.Unfetched{
:aspect => atom(),
binary() => binary() | [any()] | map()
},
:query_string => binary(),
:remote_ip =>
{byte(), byte(), byte(), byte()}
| {char(), char(), char(), char(), char(), char(), char(), char()},
:req_cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => binary()},
:req_headers => [{_, _}],
:request_path => binary(),
:resp_body =>
nil
| binary()
| maybe_improper_list(
binary() | maybe_improper_list(any(), binary() | []) | byte(),
binary() | []
),
:resp_cookies => %{binary() => map()},
:resp_headers => [{_, _}],
:scheme => :http | :https,
:script_name => [binary()],
:secret_key_base => nil | binary(),
:state => :sent,
:status => nil | non_neg_integer()
}
and the contract is
(Plug.Conn.t(), binary() | atom(), Keyword.t() | map()) :: Plug.Conn.t()
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:244:no_return
Function suggest/2 has no local return.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:254:call
The function call will not succeed.
Phoenix.Controller.render(
_conn :: %{
:assigns => %{:user => _, _ => _},
:body_params => %{:nicknames => _, _ => _},
_ => _
},
<<105, 110, 100, 101, 120, 46, 106, 115, 111, 110>>,
[{:users, _}, ...]
)
will never return since the success typing is:
(
%Plug.Conn{
:adapter => {atom(), _},
:assigns => %{atom() => _},
:body_params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:halted => boolean(),
:host => binary(),
:method => binary(),
:owner => pid(),
:params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:path_info => [binary()],
:path_params => %{binary() => binary() | [any()] | map()},
:port => char(),
:private => %{atom() => _},
:query_params => %Plug.Conn.Unfetched{
:aspect => atom(),
binary() => binary() | [any()] | map()
},
:query_string => binary(),
:remote_ip =>
{byte(), byte(), byte(), byte()}
| {char(), char(), char(), char(), char(), char(), char(), char()},
:req_cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => binary()},
:req_headers => [{_, _}],
:request_path => binary(),
:resp_body =>
nil
| binary()
| maybe_improper_list(
binary() | maybe_improper_list(any(), binary() | []) | byte(),
binary() | []
),
:resp_cookies => %{binary() => map()},
:resp_headers => [{_, _}],
:scheme => :http | :https,
:script_name => [binary()],
:secret_key_base => nil | binary(),
:state =>
:chunked | :file | :sent | :set | :set_chunked | :set_file | :unset | :upgraded,
:status => nil | non_neg_integer()
},
atom() | binary(),
atom() | binary() | [{_, _}] | map()
) :: %Plug.Conn{
:adapter => {atom(), _},
:assigns => %{atom() => _},
:body_params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:halted => boolean(),
:host => binary(),
:method => binary(),
:owner => pid(),
:params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:path_info => [binary()],
:path_params => %{binary() => binary() | [any()] | map()},
:port => char(),
:private => %{atom() => _},
:query_params => %Plug.Conn.Unfetched{
:aspect => atom(),
binary() => binary() | [any()] | map()
},
:query_string => binary(),
:remote_ip =>
{byte(), byte(), byte(), byte()}
| {char(), char(), char(), char(), char(), char(), char(), char()},
:req_cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => binary()},
:req_headers => [{_, _}],
:request_path => binary(),
:resp_body =>
nil
| binary()
| maybe_improper_list(
binary() | maybe_improper_list(any(), binary() | []) | byte(),
binary() | []
),
:resp_cookies => %{binary() => map()},
:resp_headers => [{_, _}],
:scheme => :http | :https,
:script_name => [binary()],
:secret_key_base => nil | binary(),
:state => :sent,
:status => nil | non_neg_integer()
}
and the contract is
(Plug.Conn.t(), binary() | atom(), Keyword.t() | map()) :: Plug.Conn.t()
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:257:no_return
Function unsuggest/2 has no local return.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:267:call
The function call will not succeed.
Phoenix.Controller.render(
_conn :: %{
:assigns => %{:user => _, _ => _},
:body_params => %{:nicknames => _, _ => _},
_ => _
},
<<105, 110, 100, 101, 120, 46, 106, 115, 111, 110>>,
[{:users, _}, ...]
)
will never return since the success typing is:
(
%Plug.Conn{
:adapter => {atom(), _},
:assigns => %{atom() => _},
:body_params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:halted => boolean(),
:host => binary(),
:method => binary(),
:owner => pid(),
:params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:path_info => [binary()],
:path_params => %{binary() => binary() | [any()] | map()},
:port => char(),
:private => %{atom() => _},
:query_params => %Plug.Conn.Unfetched{
:aspect => atom(),
binary() => binary() | [any()] | map()
},
:query_string => binary(),
:remote_ip =>
{byte(), byte(), byte(), byte()}
| {char(), char(), char(), char(), char(), char(), char(), char()},
:req_cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => binary()},
:req_headers => [{_, _}],
:request_path => binary(),
:resp_body =>
nil
| binary()
| maybe_improper_list(
binary() | maybe_improper_list(any(), binary() | []) | byte(),
binary() | []
),
:resp_cookies => %{binary() => map()},
:resp_headers => [{_, _}],
:scheme => :http | :https,
:script_name => [binary()],
:secret_key_base => nil | binary(),
:state =>
:chunked | :file | :sent | :set | :set_chunked | :set_file | :unset | :upgraded,
:status => nil | non_neg_integer()
},
atom() | binary(),
atom() | binary() | [{_, _}] | map()
) :: %Plug.Conn{
:adapter => {atom(), _},
:assigns => %{atom() => _},
:body_params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:halted => boolean(),
:host => binary(),
:method => binary(),
:owner => pid(),
:params => %Plug.Conn.Unfetched{:aspect => atom(), binary() => _},
:path_info => [binary()],
:path_params => %{binary() => binary() | [any()] | map()},
:port => char(),
:private => %{atom() => _},
:query_params => %Plug.Conn.Unfetched{
:aspect => atom(),
binary() => binary() | [any()] | map()
},
:query_string => binary(),
:remote_ip =>
{byte(), byte(), byte(), byte()}
| {char(), char(), char(), char(), char(), char(), char(), char()},
:req_cookies => %Plug.Conn.Unfetched{:aspect => atom(), binary() => binary()},
:req_headers => [{_, _}],
:request_path => binary(),
:resp_body =>
nil
| binary()
| maybe_improper_list(
binary() | maybe_improper_list(any(), binary() | []) | byte(),
binary() | []
),
:resp_cookies => %{binary() => map()},
:resp_headers => [{_, _}],
:scheme => :http | :https,
:script_name => [binary()],
:secret_key_base => nil | binary(),
:state => :sent,
:status => nil | non_neg_integer()
}
and the contract is
(Plug.Conn.t(), binary() | atom(), Keyword.t() | map()) :: Plug.Conn.t()
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:270:no_return
Function index/2 has no local return.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:294:unused_fun
Function maybe_parse_filters/1 will never be called.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:303:no_return
Function page_params/1 has no local return.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:305:call
The function call will not succeed.
Pleroma.Web.ControllerHelper.fetch_integer_param(_params :: any(), :page, 1)
breaks the contract
(map(), String.t(), integer() | nil) :: integer() | nil
Diffstat:
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/lib/pleroma/web/admin_api/controllers/user_controller.ex b/lib/pleroma/web/admin_api/controllers/user_controller.ex
@@ -53,11 +53,11 @@ defmodule Pleroma.Web.AdminAPI.UserController do
def delete(conn, %{nickname: nickname}) do
conn
- |> Map.put(:body_params, %{nicknames: [nickname]})
+ |> Map.put(:body_params, %{"nicknames" => [nickname]})
|> delete(%{})
end
- def delete(%{assigns: %{user: admin}, body_params: %{nicknames: nicknames}} = conn, _) do
+ def delete(%{assigns: %{user: admin}, body_params: %{"nicknames" => nicknames}} = conn, _) do
users = Enum.map(nicknames, &User.get_cached_by_nickname/1)
Enum.each(users, fn user ->
@@ -78,8 +78,8 @@ defmodule Pleroma.Web.AdminAPI.UserController do
%{
assigns: %{user: admin},
body_params: %{
- follower: follower_nick,
- followed: followed_nick
+ "follower" => follower_nick,
+ "followed" => followed_nick
}
} = conn,
_
@@ -103,8 +103,8 @@ defmodule Pleroma.Web.AdminAPI.UserController do
%{
assigns: %{user: admin},
body_params: %{
- follower: follower_nick,
- followed: followed_nick
+ "follower" => follower_nick,
+ "followed" => followed_nick
}
} = conn,
_
@@ -124,7 +124,7 @@ defmodule Pleroma.Web.AdminAPI.UserController do
json(conn, "ok")
end
- def create(%{assigns: %{user: admin}, body_params: %{users: users}} = conn, _) do
+ def create(%{assigns: %{user: admin}, body_params: %{"users" => users}} = conn, _) do
changesets =
users
|> Enum.map(fn %{nickname: nickname, email: email, password: password} ->
@@ -202,7 +202,7 @@ defmodule Pleroma.Web.AdminAPI.UserController do
render(conn, "show.json", user: updated_user)
end
- def activate(%{assigns: %{user: admin}, body_params: %{nicknames: nicknames}} = conn, _) do
+ def activate(%{assigns: %{user: admin}, body_params: %{"nicknames" => nicknames}} = conn, _) do
users = Enum.map(nicknames, &User.get_cached_by_nickname/1)
{:ok, updated_users} = User.set_activation(users, true)
@@ -215,7 +215,7 @@ defmodule Pleroma.Web.AdminAPI.UserController do
render(conn, "index.json", users: Keyword.values(updated_users))
end
- def deactivate(%{assigns: %{user: admin}, body_params: %{nicknames: nicknames}} = conn, _) do
+ def deactivate(%{assigns: %{user: admin}, body_params: %{"nicknames" => nicknames}} = conn, _) do
users = Enum.map(nicknames, &User.get_cached_by_nickname/1)
{:ok, updated_users} = User.set_activation(users, false)
@@ -228,7 +228,7 @@ defmodule Pleroma.Web.AdminAPI.UserController do
render(conn, "index.json", users: Keyword.values(updated_users))
end
- def approve(%{assigns: %{user: admin}, body_params: %{nicknames: nicknames}} = conn, _) do
+ def approve(%{assigns: %{user: admin}, body_params: %{"nicknames" => nicknames}} = conn, _) do
users = Enum.map(nicknames, &User.get_cached_by_nickname/1)
{:ok, updated_users} = User.approve(users)
@@ -241,7 +241,7 @@ defmodule Pleroma.Web.AdminAPI.UserController do
render(conn, "index.json", users: updated_users)
end
- def suggest(%{assigns: %{user: admin}, body_params: %{nicknames: nicknames}} = conn, _) do
+ def suggest(%{assigns: %{user: admin}, body_params: %{"nicknames" => nicknames}} = conn, _) do
users = Enum.map(nicknames, &User.get_cached_by_nickname/1)
{:ok, updated_users} = User.set_suggestion(users, true)
@@ -254,7 +254,7 @@ defmodule Pleroma.Web.AdminAPI.UserController do
render(conn, "index.json", users: updated_users)
end
- def unsuggest(%{assigns: %{user: admin}, body_params: %{nicknames: nicknames}} = conn, _) do
+ def unsuggest(%{assigns: %{user: admin}, body_params: %{"nicknames" => nicknames}} = conn, _) do
users = Enum.map(nicknames, &User.get_cached_by_nickname/1)
{:ok, updated_users} = User.set_suggestion(users, false)
diff --git a/lib/pleroma/web/api_spec/operations/admin/user_operation.ex b/lib/pleroma/web/api_spec/operations/admin/user_operation.ex
@@ -50,7 +50,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.UserOperation do
%Schema{
type: :object,
properties: %{
- users: %Schema{type: :array, items: user()},
+ "users" => %Schema{type: :array, items: user()},
count: %Schema{type: :integer},
page_size: %Schema{type: :integer}
}
@@ -75,7 +75,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.UserOperation do
description: "POST body for creating users",
type: :object,
properties: %{
- users: %Schema{
+ "users" => %Schema{
type: :array,
items: %Schema{
type: :object,
@@ -168,8 +168,8 @@ defmodule Pleroma.Web.ApiSpec.Admin.UserOperation do
%Schema{
type: :object,
properties: %{
- follower: %Schema{type: :string, description: "Follower nickname"},
- followed: %Schema{type: :string, description: "Followed nickname"}
+ "follower" => %Schema{type: :string, description: "Follower nickname"},
+ "followed" => %Schema{type: :string, description: "Followed nickname"}
}
}
),
@@ -193,8 +193,8 @@ defmodule Pleroma.Web.ApiSpec.Admin.UserOperation do
%Schema{
type: :object,
properties: %{
- follower: %Schema{type: :string, description: "Follower nickname"},
- followed: %Schema{type: :string, description: "Followed nickname"}
+ "follower" => %Schema{type: :string, description: "Follower nickname"},
+ "followed" => %Schema{type: :string, description: "Followed nickname"}
}
}
),
@@ -219,7 +219,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.UserOperation do
description: "POST body for approving multiple users",
type: :object,
properties: %{
- nicknames: %Schema{
+ "nicknames" => %Schema{
type: :array,
items: %Schema{type: :string}
}
@@ -251,7 +251,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.UserOperation do
description: "POST body for adding multiple suggested users",
type: :object,
properties: %{
- nicknames: %Schema{
+ "nicknames" => %Schema{
type: :array,
items: %Schema{type: :string}
}
@@ -283,7 +283,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.UserOperation do
description: "POST body for removing multiple suggested users",
type: :object,
properties: %{
- nicknames: %Schema{
+ "nicknames" => %Schema{
type: :array,
items: %Schema{type: :string}
}
@@ -332,7 +332,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.UserOperation do
description: "POST body for deleting multiple users",
type: :object,
properties: %{
- nicknames: %Schema{
+ "nicknames" => %Schema{
type: :array,
items: %Schema{type: :string}
}
@@ -364,7 +364,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.UserOperation do
description: "POST body for deleting multiple users",
type: :object,
properties: %{
- nicknames: %Schema{
+ "nicknames" => %Schema{
type: :array,
items: %Schema{type: :string}
}
@@ -404,7 +404,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.UserOperation do
description: "POST body for deleting multiple users",
type: :object,
properties: %{
- nicknames: %Schema{
+ "nicknames" => %Schema{
type: :array,
items: %Schema{type: :string}
}
