Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Don't copy messages of type "normal" without body 

Don't carbon-copy messages of type "normal" that don't have a body
element as an immediate subtag.  Those messages are usually generated by
clients or servers (as opposed to messages written by humans).  This
includes MAM messages, for example.
This commit is contained in:
Holger Weiss 2015-07-28 21:34:02 +02:00
parent 8fe930c3d1
commit 04094b3dcf
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod_carboncopy.erl
View File

@ -136,7 +136,7 @@ user_receive_packet(Packet, _C2SState, JID, _From, To) ->
% - do not support "private" message mode, and do not modify the original packet in any way
% - we also replicate "read" notifications
check_and_forward(JID, To, Packet, Direction)->
case is_chat_or_normal_message(Packet) andalso
case is_chat_message(Packet) andalso
xml:get_subtag(Packet, <<"private">>) == false andalso
xml:get_subtag(Packet, <<"no-copy">>) == false of
true ->
@ -273,13 +273,16 @@ message_type(#xmlel{attrs = Attrs}) ->
false -> <<"normal">>
end.
is_chat_or_normal_message(#xmlel{name = <<"message">>} = Packet) ->
is_chat_message(#xmlel{name = <<"message">>} = Packet) ->
case message_type(Packet) of
<<"chat">> -> true;
<<"normal">> -> true;
<<"normal">> -> has_non_empty_body(Packet);
_ -> false
end;
is_chat_or_normal_message(_Packet) -> false.
is_chat_message(_Packet) -> false.
has_non_empty_body(Packet) ->
xml:get_subtag_cdata(Packet, <<"body">>) =/= <<"">>.
%% list {resource, cc_version} with carbons enabled for given user and host
list(User, Server)->