25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00

Make string args in http_api be list strings

This commit is contained in:
Paweł Chmielowski 2016-11-10 11:15:34 +01:00
parent 309962fb8b
commit 717159a98f

View File

@ -273,7 +273,7 @@ handle(Call, Auth, Args, Version) when is_atom(Call), is_list(Args) ->
fun ({Key, binary}, Acc) -> fun ({Key, binary}, Acc) ->
[{Key, <<>>}|Acc]; [{Key, <<>>}|Acc];
({Key, string}, Acc) -> ({Key, string}, Acc) ->
[{Key, <<>>}|Acc]; [{Key, ""}|Acc];
({Key, integer}, Acc) -> ({Key, integer}, Acc) ->
[{Key, 0}|Acc]; [{Key, 0}|Acc];
({Key, {list, _}}, Acc) -> ({Key, {list, _}}, Acc) ->
@ -406,10 +406,10 @@ format_arg(Elements, {list, ElementsDef})
format_arg(Arg, integer) when is_integer(Arg) -> Arg; format_arg(Arg, integer) when is_integer(Arg) -> Arg;
format_arg(Arg, binary) when is_list(Arg) -> process_unicode_codepoints(Arg); format_arg(Arg, binary) when is_list(Arg) -> process_unicode_codepoints(Arg);
format_arg(Arg, binary) when is_binary(Arg) -> Arg; format_arg(Arg, binary) when is_binary(Arg) -> Arg;
format_arg(Arg, string) when is_list(Arg) -> process_unicode_codepoints(Arg); format_arg(Arg, string) when is_list(Arg) -> Arg;
format_arg(Arg, string) when is_binary(Arg) -> Arg; format_arg(Arg, string) when is_binary(Arg) -> binary_to_list(Arg);
format_arg(undefined, binary) -> <<>>; format_arg(undefined, binary) -> <<>>;
format_arg(undefined, string) -> <<>>; format_arg(undefined, string) -> "";
format_arg(Arg, Format) -> format_arg(Arg, Format) ->
?ERROR_MSG("don't know how to format Arg ~p for format ~p", [Arg, Format]), ?ERROR_MSG("don't know how to format Arg ~p for format ~p", [Arg, Format]),
throw({invalid_parameter, throw({invalid_parameter,