yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-05 02:29:34 +02:00
Code Issues Releases Wiki Activity

Use json module when Erlang/OTP 27, jiffy with older ones

Browse source
This commit is contained in:
Badlop 2024-05-06 18:02:36 +02:00
parent 0ad1d315e8
commit 696e42b5b4
15 changed files with 84 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/mod_http_api.erl
View file

@ -197,7 +197,7 @@ perform_call(Command, Args, Req, Version) ->
%% Be tolerant to make API more easily usable from command-line pipe.
extract_args(<<"\n">>) -> [];
extract_args(Data) ->
Maps = jiffy:decode(Data, [return_maps]),
Maps = misc:json_decode(Data),
maps:to_list(Maps).
% get API version N from last "vN" element in URL path
@ -492,10 +492,10 @@ invalid_token_response() ->
badrequest_response() ->
badrequest_response(<<"400 Bad Request">>).
badrequest_response(Body) ->
json_response(400, jiffy:encode(Body)).
json_response(400, misc:json_encode(Body)).
json_format({Code, Result}) ->
json_response(Code, jiffy:encode(Result));
json_response(Code, misc:json_encode(Result));
json_format({HTMLCode, JSONErrorCode, Message}) ->
json_error(HTMLCode, JSONErrorCode, Message).
@ -506,8 +506,8 @@ json_response(Code, Body) when is_integer(Code) ->
%% message is binary
json_error(HTTPCode, JSONCode, Message) ->
{HTTPCode, ?HEADER(?CT_JSON),
jiffy:encode(#{<<"status">> => <<"error">>,
<<"code">> => JSONCode,
misc:json_encode(#{<<"status">> => <<"error">>,
<<"code">> => JSONCode,
<<"message">> => Message})
}.