Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-26 22:35:31 +02:00
Code Releases Activity

Don't include empty <subject/> in messages sent by send_message

Browse Source 
Please refer issue #3485
This commit is contained in:
Paweł Chmielowski 2021-01-13 20:57:03 +01:00
parent b6d90cc55c
commit 7fc500dae6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod_admin_extra.erl
View File

@ -1494,10 +1494,15 @@ send_message(Type, From, To, Subject, Body) ->
#xmlel{name = <<"body">>, #xmlel{name = <<"body">>,
children = [{xmlcdata, Body}]}]}, children = [{xmlcdata, Body}]}]},
?NS_CLIENT, CodecOpts) of ?NS_CLIENT, CodecOpts) of
#message{from = JID} = Msg -> #message{from = JID, subject = Subject, body = Body} = Msg ->
Msg2 = case {xmpp:get_text(Subject), xmpp:get_text(Body)} of
{_, <<>>} -> Msg;
{<<>>, _} -> Msg#message{subject = []};
_ -> Msg
end,
State = #{jid => JID}, State = #{jid => JID},
ejabberd_hooks:run_fold(user_send_packet, JID#jid.lserver, {Msg, State}, []), ejabberd_hooks:run_fold(user_send_packet, JID#jid.lserver, {Msg2, State}, []),
ejabberd_router:route(Msg) ejabberd_router:route(Msg2)
catch _:{xmpp_codec, Why} -> catch _:{xmpp_codec, Why} ->
{error, xmpp:format_error(Why)} {error, xmpp:format_error(Why)}
end. end.