diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2016-11-12 13:27:15 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2016-11-12 13:27:15 +0300 |
| commit | 78a44e01762e00102f5e3e3f0b49690cc7866c31 (patch) | |
| tree | b8ac7773f510ee3c1da4802bce2badc71c34c0b2 /src/mod_carboncopy.erl | |
| parent | Add more tests for offline storage (diff) | |
| parent | Support several groups separated by ; in add_rosteritem command (diff) | |
Merge branch 'master' into xml-ng
Conflicts:
src/adhoc.erl
src/cyrsasl_oauth.erl
src/ejabberd_c2s.erl
src/ejabberd_config.erl
src/ejabberd_service.erl
src/gen_mod.erl
src/mod_admin_extra.erl
src/mod_announce.erl
src/mod_carboncopy.erl
src/mod_client_state.erl
src/mod_configure.erl
src/mod_echo.erl
src/mod_mam.erl
src/mod_muc.erl
src/mod_muc_room.erl
src/mod_offline.erl
src/mod_pubsub.erl
src/mod_stats.erl
src/node_flat_sql.erl
src/randoms.erl
Diffstat (limited to 'src/mod_carboncopy.erl')
| -rw-r--r-- | src/mod_carboncopy.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl index e35caa1c7..023e8dc6f 100644 --- a/src/mod_carboncopy.erl +++ b/src/mod_carboncopy.erl @@ -123,6 +123,7 @@ user_receive_packet(Packet, _C2SState, JID, _From, To) -> stanza() | {stop, stanza()}. check_and_forward(JID, To, Packet, Direction)-> case is_chat_message(Packet) andalso + not is_muc_pm(To, Packet) andalso xmpp:has_subtag(Packet, #carbons_private{}) == false andalso xmpp:has_subtag(Packet, #hint{type = 'no-copy'}) == false of true -> @@ -232,6 +233,11 @@ is_chat_message(#message{type = normal, body = Body}) -> is_chat_message(_) -> false. +is_muc_pm(#jid{lresource = <<>>}, _Packet) -> + false; +is_muc_pm(_To, Packet) -> + xmpp:has_subtag(Packet, #muc_user{}). + -spec list(binary(), binary()) -> [{binary(), binary()}]. %% list {resource, cc_version} with carbons enabled for given user and host list(User, Server) -> |