diff options
author | Christophe Romain <christophe.romain@process-one.net> | 2015-10-07 01:06:58 +0300 |
---|---|---|
committer | Christophe Romain <christophe.romain@process-one.net> | 2015-10-07 15:18:38 +0300 |
commit | 6aeb9dcb38921249cdfe453baeadcd03298d5d6e (patch) | |
tree | df5559ad1f52ec9ed536c8399fd5bde714985059 /src/mod_carboncopy.erl | |
parent | 83dd79a6a78c8ac5c5a73143caa1a23c3a0a7f6e (diff) |
cosmetic cleanup
Diffstat (limited to 'src/mod_carboncopy.erl')
-rw-r--r-- | src/mod_carboncopy.erl | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl index 42c77f150..8fc2ca79e 100644 --- a/src/mod_carboncopy.erl +++ b/src/mod_carboncopy.erl @@ -25,6 +25,7 @@ %%% %%%---------------------------------------------------------------------- -module (mod_carboncopy). + -author ('ecestari@process-one.net'). -protocol({xep, 280, '0.8'}). @@ -112,7 +113,7 @@ iq_handler(From, _To, #iq{type=set, sub_el = #xmlel{name = Operation, children ?INFO_MSG("carbons disabled for user ~s@~s/~s", [U,S,R]), disable(S, U, R) end, - case Result of + case Result of ok -> ?DEBUG("carbons IQ result: ok", []), IQ#iq{type=result, sub_el=[]}; @@ -129,9 +130,8 @@ user_send_packet(Packet, _C2SState, From, To) -> user_receive_packet(Packet, _C2SState, JID, _From, To) -> check_and_forward(JID, To, Packet, received). - -% verifier si le trafic est local -% Modified from original version: + +% Modified from original version: % - registered to the user_send_packet hook, to be called only once even for multicast % - do not support "private" message mode, and do not modify the original packet in any way % - we also replicate "read" notifications @@ -145,8 +145,8 @@ check_and_forward(JID, To, Packet, Direction)-> send_copies(JID, To, Packet, Direction), Packet; true -> - %% stop the hook chain, we don't want mod_logdb to register - %% this message (duplicate) + %% stop the hook chain, we don't want logging modules to duplicates + %% this message {stop, Packet} end; _ -> @@ -156,7 +156,7 @@ check_and_forward(JID, To, Packet, Direction)-> remove_connection(User, Server, Resource, _Status)-> disable(Server, User, Resource), ok. - + %%% Internal %% Direction = received | sent <received xmlns='urn:xmpp:carbons:1'/> @@ -208,31 +208,31 @@ send_copies(JID, To, Packet, Direction)-> ok. build_forward_packet(JID, Packet, Sender, Dest, Direction, ?NS_CARBONS_2) -> - #xmlel{name = <<"message">>, + #xmlel{name = <<"message">>, attrs = [{<<"xmlns">>, <<"jabber:client">>}, {<<"type">>, message_type(Packet)}, {<<"from">>, jlib:jid_to_string(Sender)}, {<<"to">>, jlib:jid_to_string(Dest)}], - children = [ - #xmlel{name = list_to_binary(atom_to_list(Direction)), + children = [ + #xmlel{name = list_to_binary(atom_to_list(Direction)), attrs = [{<<"xmlns">>, ?NS_CARBONS_2}], children = [ - #xmlel{name = <<"forwarded">>, + #xmlel{name = <<"forwarded">>, attrs = [{<<"xmlns">>, ?NS_FORWARD}], children = [ complete_packet(JID, Packet, Direction)]} ]} ]}; build_forward_packet(JID, Packet, Sender, Dest, Direction, ?NS_CARBONS_1) -> - #xmlel{name = <<"message">>, + #xmlel{name = <<"message">>, attrs = [{<<"xmlns">>, <<"jabber:client">>}, {<<"type">>, message_type(Packet)}, {<<"from">>, jlib:jid_to_string(Sender)}, {<<"to">>, jlib:jid_to_string(Dest)}], - children = [ - #xmlel{name = list_to_binary(atom_to_list(Direction)), + children = [ + #xmlel{name = list_to_binary(atom_to_list(Direction)), attrs = [{<<"xmlns">>, ?NS_CARBONS_1}]}, - #xmlel{name = <<"forwarded">>, + #xmlel{name = <<"forwarded">>, attrs = [{<<"xmlns">>, ?NS_FORWARD}], children = [complete_packet(JID, Packet, Direction)]} ]}. @@ -285,7 +285,7 @@ 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)-> +list(User, Server) -> mnesia:dirty_select(?TABLE, [{#carboncopy{us = {User, Server}, resource = '$2', version = '$3'}, [], [{{'$2','$3'}}]}]). |