Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-20 17:27:00 +01:00
Code Releases Activity

Get rid of substitute_forwarded

Browse Source
This commit is contained in:
Paweł Chmielowski 2016-11-18 11:51:57 +01:00
parent f57f267c54
commit e69937d93a
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/suite.erl
View File

@ -481,22 +481,9 @@ format_element(El) ->
false -> io_lib:format(" ~s~n", El)
end.
substitute_forwarded(#mam_result{sub_els = Sub} = El) ->
El#mam_result{sub_els = [substitute_forwarded(SEl) || SEl <- Sub]};
substitute_forwarded(#carbons_sent{forwarded = Sub} = El) ->
El#carbons_sent{forwarded = [substitute_forwarded(SEl) || SEl <- Sub]};
substitute_forwarded(#message{sub_els = Sub} = El) ->
El#message{sub_els = [substitute_forwarded(SEl) || SEl <- Sub]};
substitute_forwarded(#forwarded{delay = Delay, xml_els = Sub}) ->
#forwarded_decoded{delay = Delay, sub_els = [xmpp:decode(SEl) || SEl <- Sub]};
substitute_forwarded(El) ->
El.
decode(El, NS, Opts) ->
try
Pkt = substitute_forwarded(xmpp:decode(El, NS, Opts)),
Pkt = xmpp:decode(El, NS, Opts),
ct:pal("RECV:~n~s~n~s",
[format_element(El), xmpp:pp(Pkt)]),
Pkt

3
test/suite.hrl
View File

@ -5,9 +5,6 @@
-include("mod_proxy65.hrl").
-include("xmpp_codec.hrl").
-record(forwarded_decoded, {delay :: #delay{},
sub_els = [] :: [fxml:xmlel()]}).
-define(STREAM_TRAILER, <<"</stream:stream>">>).
-define(PUBSUB(Node), <<(?NS_PUBSUB)/binary, "#", Node>>).