diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2016-05-01 12:48:23 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2016-05-01 12:48:23 +0300 |
| commit | 8700a3401e577b3f922d178b79fe5560b00a0f3c (patch) | |
| tree | 30edd655aa4055a00b2a87e01147dc8130216ced /tools | |
| parent | 82082f1799982acaa333c3a2a1368225b5921f45 (diff) | |
Add tests for MUC MAM
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/xmpp_codec.erl | 9 | ||||
| -rw-r--r-- | tools/xmpp_codec.spec | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/tools/xmpp_codec.erl b/tools/xmpp_codec.erl index 01e0676ae..52950feac 100644 --- a/tools/xmpp_codec.erl +++ b/tools/xmpp_codec.erl @@ -103,6 +103,8 @@ decode({xmlel, _name, _attrs, _} = _el, Opts) -> decode_mam_fin(<<"urn:xmpp:mam:0">>, IgnoreEls, _el); {<<"prefs">>, <<"urn:xmpp:mam:0">>} -> decode_mam_prefs(<<"urn:xmpp:mam:0">>, IgnoreEls, _el); + {<<"prefs">>, <<"urn:xmpp:mam:1">>} -> + decode_mam_prefs(<<"urn:xmpp:mam:1">>, IgnoreEls, _el); {<<"prefs">>, <<"urn:xmpp:mam:tmp">>} -> decode_mam_prefs(<<"urn:xmpp:mam:tmp">>, IgnoreEls, _el); @@ -116,6 +118,8 @@ decode({xmlel, _name, _attrs, _} = _el, Opts) -> decode_mam_jid(<<"urn:xmpp:mam:tmp">>, IgnoreEls, _el); {<<"result">>, <<"urn:xmpp:mam:0">>} -> decode_mam_result(<<"urn:xmpp:mam:0">>, IgnoreEls, _el); + {<<"result">>, <<"urn:xmpp:mam:1">>} -> + decode_mam_result(<<"urn:xmpp:mam:1">>, IgnoreEls, _el); {<<"result">>, <<"urn:xmpp:mam:tmp">>} -> decode_mam_result(<<"urn:xmpp:mam:tmp">>, IgnoreEls, _el); @@ -124,6 +128,8 @@ decode({xmlel, _name, _attrs, _} = _el, Opts) -> _el); {<<"query">>, <<"urn:xmpp:mam:0">>} -> decode_mam_query(<<"urn:xmpp:mam:0">>, IgnoreEls, _el); + {<<"query">>, <<"urn:xmpp:mam:1">>} -> + decode_mam_query(<<"urn:xmpp:mam:1">>, IgnoreEls, _el); {<<"query">>, <<"urn:xmpp:mam:tmp">>} -> decode_mam_query(<<"urn:xmpp:mam:tmp">>, IgnoreEls, _el); @@ -1141,14 +1147,17 @@ is_known_tag({xmlel, _name, _attrs, _} = _el) -> {<<"forwarded">>, <<"urn:xmpp:forward:0">>} -> true; {<<"fin">>, <<"urn:xmpp:mam:0">>} -> true; {<<"prefs">>, <<"urn:xmpp:mam:0">>} -> true; + {<<"prefs">>, <<"urn:xmpp:mam:1">>} -> true; {<<"prefs">>, <<"urn:xmpp:mam:tmp">>} -> true; {<<"always">>, <<"urn:xmpp:mam:tmp">>} -> true; {<<"never">>, <<"urn:xmpp:mam:tmp">>} -> true; {<<"jid">>, <<"urn:xmpp:mam:tmp">>} -> true; {<<"result">>, <<"urn:xmpp:mam:0">>} -> true; + {<<"result">>, <<"urn:xmpp:mam:1">>} -> true; {<<"result">>, <<"urn:xmpp:mam:tmp">>} -> true; {<<"archived">>, <<"urn:xmpp:mam:tmp">>} -> true; {<<"query">>, <<"urn:xmpp:mam:0">>} -> true; + {<<"query">>, <<"urn:xmpp:mam:1">>} -> true; {<<"query">>, <<"urn:xmpp:mam:tmp">>} -> true; {<<"with">>, <<"urn:xmpp:mam:tmp">>} -> true; {<<"end">>, <<"urn:xmpp:mam:tmp">>} -> true; diff --git a/tools/xmpp_codec.spec b/tools/xmpp_codec.spec index e61b951c5..536a11dfb 100644 --- a/tools/xmpp_codec.spec +++ b/tools/xmpp_codec.spec @@ -2145,7 +2145,7 @@ -xml(mam_query, #elem{name = <<"query">>, - xmlns = [<<"urn:xmpp:mam:0">>, <<"urn:xmpp:mam:tmp">>], + xmlns = [<<"urn:xmpp:mam:0">>, <<"urn:xmpp:mam:1">>, <<"urn:xmpp:mam:tmp">>], result = {mam_query, '$xmlns', '$id', '$start', '$end', '$with', '$rsm', '$xdata'}, attrs = [#attr{name = <<"queryid">>, label = '$id'}, @@ -2168,7 +2168,7 @@ -xml(mam_result, #elem{name = <<"result">>, - xmlns = [<<"urn:xmpp:mam:0">>, <<"urn:xmpp:mam:tmp">>], + xmlns = [<<"urn:xmpp:mam:0">>, <<"urn:xmpp:mam:1">>, <<"urn:xmpp:mam:tmp">>], result = {mam_result, '$xmlns', '$queryid', '$id', '$_els'}, attrs = [#attr{name = <<"queryid">>}, #attr{name = <<"xmlns">>}, @@ -2196,7 +2196,7 @@ -xml(mam_prefs, #elem{name = <<"prefs">>, - xmlns = [<<"urn:xmpp:mam:0">>, <<"urn:xmpp:mam:tmp">>], + xmlns = [<<"urn:xmpp:mam:0">>, <<"urn:xmpp:mam:1">>, <<"urn:xmpp:mam:tmp">>], result = {mam_prefs, '$xmlns', '$default', '$always', '$never'}, attrs = [#attr{name = <<"default">>, dec = {dec_enum, [[always, never, roster]]}, |