24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-06-12 21:52:07 +02:00

mod_admin_extra: Let send_message omit subject

Let the send_message command omit the subject if the user either
specified an empty subject or a message type of "chat".
This commit is contained in:
Holger Weiss 2015-03-11 20:56:10 +01:00 committed by Badlop
parent 88cd8c7b12
commit 5103ed1c3b

View File

@ -1406,10 +1406,9 @@ send_packet_all_resources(FromJID, ToU, ToS, ToR, Packet) ->
ejabberd_router:route(FromJID, ToJID, Packet). ejabberd_router:route(FromJID, ToJID, Packet).
build_packet(Type, Subject, Body) -> build_packet(Type, Subject, Body) ->
Tail = case Subject of Tail = if Subject == <<"">>; Type == <<"chat">> -> [];
<<"chat">> -> []; true -> [{xmlel, <<"subject">>, [], [{xmlcdata, Subject}]}]
_ -> [{xmlel, <<"subject">>, [], [{xmlcdata, Subject}]}] end,
end,
{xmlel, <<"message">>, {xmlel, <<"message">>,
[{<<"type">>, Type}, {<<"id">>, randoms:get_string()}], [{<<"type">>, Type}, {<<"id">>, randoms:get_string()}],
[{xmlel, <<"body">>, [], [{xmlcdata, Body}]} | Tail] [{xmlel, <<"body">>, [], [{xmlcdata, Body}]} | Tail]