25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-20 17:27:00 +01:00

Merge pull request #57 from rraptorr/carboncopy

Change message type of carbon copies from 'chart' to 'chat'
This commit is contained in:
badlop 2013-04-10 04:40:28 -07:00
commit c98540b8db

View File

@ -193,7 +193,7 @@ send_copies(JID, Packet, Direction)->
build_forward_packet(JID, Packet, Sender, Dest, Direction, ?NS_CC_2) -> build_forward_packet(JID, Packet, Sender, Dest, Direction, ?NS_CC_2) ->
#xmlel{name = <<"message">>, #xmlel{name = <<"message">>,
attrs = [{<<"xmlns">>, <<"jabber:client">>}, attrs = [{<<"xmlns">>, <<"jabber:client">>},
{<<"type">>, <<"chart">>}, {<<"type">>, <<"chat">>},
{<<"from">>, jlib:jid_to_string(Sender)}, {<<"from">>, jlib:jid_to_string(Sender)},
{<<"to">>, jlib:jid_to_string(Dest)}], {<<"to">>, jlib:jid_to_string(Dest)}],
children = [ children = [
@ -209,7 +209,7 @@ build_forward_packet(JID, Packet, Sender, Dest, Direction, ?NS_CC_2) ->
build_forward_packet(JID, Packet, Sender, Dest, Direction, ?NS_CC_1) -> build_forward_packet(JID, Packet, Sender, Dest, Direction, ?NS_CC_1) ->
#xmlel{name = <<"message">>, #xmlel{name = <<"message">>,
attrs = [{<<"xmlns">>, <<"jabber:client">>}, attrs = [{<<"xmlns">>, <<"jabber:client">>},
{<<"type">>, <<"chart">>}, {<<"type">>, <<"chat">>},
{<<"from">>, jlib:jid_to_string(Sender)}, {<<"from">>, jlib:jid_to_string(Sender)},
{<<"to">>, jlib:jid_to_string(Dest)}], {<<"to">>, jlib:jid_to_string(Dest)}],
children = [ children = [