Fixing dialyzer and removing square brackets around jiffy:encode used for locating lines that need changes.

Author: JanuszJakubiec

src/ejabberd_ctl.erl

@@ -188,8 +188,7 @@ handle_graphql_result({ok, Result}) ->
     end;
 handle_graphql_result({error, Reason}) ->
     {_Code, Error} = mongoose_graphql_errors:format_error(Reason),
-    %CHANGED
-    JSONResult = [jiffy:encode(#{errors => [Error]}, [pretty])],
+    JSONResult = jiffy:encode(#{errors => [Error]}, [pretty]),
     ?PRINT("~s\n", [JSONResult]),
     ?STATUS_ERROR.
 

src/event_pusher/mod_event_pusher_push_rdbms.erl

@@ -81,9 +81,9 @@ decode_row({NodeID, PubSubBin, FormJSON}) ->
      NodeID,
      decode_form(FormJSON)}.
 
+-spec encode_form(mod_event_pusher_push:form()) -> iodata().
 encode_form(Form) ->
-    %CHANGED
-    [jiffy:encode(Form)].
+    jiffy:encode(Form).
 
 decode_form(FormJSON) ->
     jiffy:decode(FormJSON, [return_maps]).

src/graphql/mongoose_graphql_handler.erl

@@ -274,8 +274,7 @@ make_error(Phase, Term) ->
 
 reply_error(Msg, Req, State) ->
     {Code, Error} = mongoose_graphql_errors:format_error(Msg),
-    %CHANGED
-    Body = [jiffy:encode(#{errors => [Error]})],
+    Body = jiffy:encode(#{errors => [Error]}),
     Req2 = cowboy_req:set_resp_body(Body, Req),
     Reply = cowboy_req:reply(Code, Req2),
     {stop, Reply, State}.

src/graphql/mongoose_graphql_sse_handler.erl

@@ -107,6 +107,5 @@ make_error(Phase, Term) ->
 
 reply_error(Reason, Req, State) ->
     {Code, Error} = mongoose_graphql_errors:format_error(Reason),
-    %CHANGED
-    Body = [jiffy:encode(#{errors => [Error]})],
+    Body = jiffy:encode(#{errors => [Error]}),
     {shutdown, Code, #{}, Body, Req, State}.

src/mod_caps_rdbms.erl

@@ -31,8 +31,7 @@ read(HostType, {Node, SubNode}) ->
 -spec write(mongooseim:host_type(), mod_caps:node_pair(),
             mod_caps:maybe_pending_features()) -> ok.
 write(HostType, {Node, SubNode}, Features) ->
-    %CHANGED
-    Encoded = [jiffy:encode(Features)],
+    Encoded = jiffy:encode(Features),
     InsertParams = [Node, SubNode, Encoded],
     UpdateParams = [Encoded],
     UniqueKeyValues = [Node, SubNode],

src/mod_push_service_mongoosepush.erl

@@ -100,8 +100,7 @@ push_notifications(AccIn,
             ReqHeaders = [{<<"content-type">>, <<"application/json">>}],
             {ok, JSON} =
                 make_notification(Notification, Options),
-            %CHANGED
-            Payload = [jiffy:encode(JSON)],
+            Payload = jiffy:encode(JSON),
             call(Host, ?MODULE, http_notification, [Host, post, Path, ReqHeaders, Payload])
         end,
     {ok, send_push_notifications(Notifications, Fun, ok)}.

src/mongoose_admin_api/mongoose_admin_api.erl

@@ -139,8 +139,7 @@ resource_created(Req, State, Path, Body) ->
 %% @doc Send response when it can't be returned in a tuple from the handler (e.g. for DELETE)
 -spec respond(req(), state(), jiffy:json_value()) -> {stop, req(), state()}.
 respond(Req, State, Response) ->
-    %CHANGED
-    Req2 = cowboy_req:set_resp_body([jiffy:encode(Response)], Req),
+    Req2 = cowboy_req:set_resp_body(jiffy:encode(Response), Req),
     Req3 = cowboy_req:reply(200, Req2),
     {stop, Req3, State}.
 
@@ -151,8 +150,7 @@ error_response(ErrorType, Message, Req, State) ->
                                  error_type => ErrorType,
                                  message => BinMessage,
                                  req => Req}),
-                                 %CHANGED
-    Req1 = cowboy_req:reply(error_code(ErrorType), #{}, [jiffy:encode(BinMessage)], Req),
+    Req1 = cowboy_req:reply(error_code(ErrorType), #{}, jiffy:encode(BinMessage), Req),
     {stop, Req1, State}.
 
 -spec error_code(error_type()) -> non_neg_integer().

src/mongoose_admin_api/mongoose_admin_api_contacts.erl

@@ -77,8 +77,7 @@ handle_get(Req, State) ->
     UserJid = get_user_jid(Bindings),
     case mod_roster_api:list_contacts(UserJid) of
         {ok, Rosters} ->
-            %CHANGED
-            {[jiffy:encode(lists:map(fun roster_info/1, Rosters))], Req, State};
+            {jiffy:encode(lists:map(fun roster_info/1, Rosters)), Req, State};
         {unknown_domain, Reason} ->
             throw_error(not_found, Reason)
     end.

src/mongoose_admin_api/mongoose_admin_api_domain.erl

@@ -92,8 +92,7 @@ handle_get(Req, State) ->
     Domain = get_domain(Bindings),
     case mongoose_domain_api:get_domain_details(Domain) of
         {ok, Props} ->
-            %CHANGED
-            {[jiffy:encode(maps:with([host_type, status], Props))], Req, State};
+            {jiffy:encode(maps:with([host_type, status], Props)), Req, State};
         {not_found, Msg} ->
             throw_error(not_found, Msg);
         {_, Msg} ->

src/mongoose_admin_api/mongoose_admin_api_messages.erl

@@ -72,8 +72,7 @@ handle_get(Req, State) ->
     case mongoose_stanza_api:lookup_recent_messages(OwnerJid, WithJid, Before, Limit, true) of
         {ok, {Rows, _Limit}} ->
             Messages = lists:map(fun row_to_map/1, Rows),
-            %CHANGED
-            {[jiffy:encode(Messages)], Req, State};
+            {jiffy:encode(Messages), Req, State};
         {unknown_user, Msg} ->
             throw_error(bad_request, Msg)
     end.