diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-07-28 22:34:02 +0300 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-07-28 22:34:02 +0300 |
| commit | 04094b3dcf75e58e53d6f7afe88f006293427047 (patch) | |
| tree | 190e3b79c989c561180e6abf803e305ba6f64c7b /src/mod_carboncopy.erl | |
| parent | 8fe930c3d1fec87a30c23d67cec5363f0aa0abe5 (diff) | |
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.
Diffstat (limited to 'src/mod_carboncopy.erl')
| -rw-r--r-- | src/mod_carboncopy.erl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl index 186aca5e3..42c77f150 100644 --- a/src/mod_carboncopy.erl +++ b/src/mod_carboncopy.erl @@ -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)-> |