Automatic changes "make spec xdata"

Author: sstrigler

include/xmpp_codec.hrl

@@ -190,15 +190,9 @@
                              cdata = <<>> :: binary()}).
 -type scram_upgrade_salt() :: #scram_upgrade_salt{}.
 
--record(receipt_request, {}).
--type receipt_request() :: #receipt_request{}.
-
 -record(legacy_auth_feature, {}).
 -type legacy_auth_feature() :: #legacy_auth_feature{}.
 
--record(rosterver_feature, {}).
--type rosterver_feature() :: #rosterver_feature{}.
-
 -record(mix_roster_channel, {participant_id = <<>> :: binary()}).
 -type mix_roster_channel() :: #mix_roster_channel{}.
 
@@ -341,6 +335,9 @@
 -record(private, {sub_els = [] :: [xmpp_element() | fxml:xmlel()]}).
 -type private() :: #private{}.
 
+-record(preauth, {token = <<>> :: binary()}).
+-type preauth() :: #preauth{}.
+
 -record(scram_upgrade_hash, {data = <<>> :: binary()}).
 -type scram_upgrade_hash() :: #scram_upgrade_hash{}.
 
@@ -389,6 +386,9 @@
                       id = <<>> :: binary()}).
 -type inbox_entry() :: #inbox_entry{}.
 
+-record(feature_register_ibr_token, {}).
+-type feature_register_ibr_token() :: #feature_register_ibr_token{}.
+
 -record(x509_challenge_failed, {}).
 -type x509_challenge_failed() :: #x509_challenge_failed{}.
 
@@ -644,6 +644,9 @@
                      items = [] :: [#ps_item{}]}).
 -type ps_publish() :: #ps_publish{}.
 
+-record(feature_pre_approval, {}).
+-type feature_pre_approval() :: #feature_pre_approval{}.
+
 -record(report, {reason :: 'abuse' | 'spam',
                  text = [] :: [#text{}]}).
 -type report() :: #report{}.
@@ -860,11 +863,6 @@
                       resource :: 'undefined' | binary()}).
 -type legacy_auth() :: #legacy_auth{}.
 
--record(privacy_query, {lists = [] :: [#privacy_list{}],
-                        default :: 'none' | 'undefined' | binary(),
-                        active :: 'none' | 'undefined' | binary()}).
--type privacy_query() :: #privacy_query{}.
-
 -record(pubsub_serverinfo_remote_domain, {name = <<>> :: binary(),
                                           type = [] :: ['bidi' | 'incoming' | 'outgoing']}).
 -type pubsub_serverinfo_remote_domain() :: #pubsub_serverinfo_remote_domain{}.
@@ -927,14 +925,6 @@
 -record(credentials, {services = [] :: [#service{}]}).
 -type credentials() :: #credentials{}.
 
--record(vcard_email, {home = false :: boolean(),
-                      work = false :: boolean(),
-                      internet = false :: boolean(),
-                      pref = false :: boolean(),
-                      x400 = false :: boolean(),
-                      userid :: 'undefined' | binary()}).
--type vcard_email() :: #vcard_email{}.
-
 -record(block_item, {jid :: jid:jid(),
                      spam_report :: 'undefined' | #report{}}).
 -type block_item() :: #block_item{}.
@@ -1255,38 +1245,6 @@
                      suffix :: 'undefined' | binary()}).
 -type vcard_name() :: #vcard_name{}.
 
--record(vcard_temp, {version :: 'undefined' | binary(),
-                     fn :: 'undefined' | binary(),
-                     n :: 'undefined' | #vcard_name{},
-                     nickname :: 'undefined' | binary(),
-                     photo :: 'undefined' | #vcard_photo{},
-                     bday :: 'undefined' | binary(),
-                     adr = [] :: [#vcard_adr{}],
-                     label = [] :: [#vcard_label{}],
-                     tel = [] :: [#vcard_tel{}],
-                     email = [] :: [#vcard_email{}],
-                     jabberid :: 'undefined' | binary(),
-                     mailer :: 'undefined' | binary(),
-                     tz :: 'undefined' | binary(),
-                     geo :: 'undefined' | #vcard_geo{},
-                     title :: 'undefined' | binary(),
-                     role :: 'undefined' | binary(),
-                     logo :: 'undefined' | #vcard_logo{},
-                     org :: 'undefined' | #vcard_org{},
-                     categories = [] :: [binary()],
-                     note :: 'undefined' | binary(),
-                     prodid :: 'undefined' | binary(),
-                     rev :: 'undefined' | binary(),
-                     sort_string :: 'undefined' | binary(),
-                     sound :: 'undefined' | #vcard_sound{},
-                     uid :: 'undefined' | binary(),
-                     url :: 'undefined' | binary(),
-                     class :: 'confidential' | 'private' | 'public' | 'undefined',
-                     key :: 'undefined' | #vcard_key{},
-                     desc :: 'undefined' | binary(),
-                     sub_els = [] :: [xmpp_element() | fxml:xmlel()]}).
--type vcard_temp() :: #vcard_temp{}.
-
 -record(ibb_data, {sid = <<>> :: binary(),
                    seq :: non_neg_integer(),
                    data = <<>> :: binary()}).
@@ -1338,28 +1296,6 @@
                        text = [] :: [#text{}]}).
 -type sasl_failure() :: #sasl_failure{}.
 
--record(bind, {jid :: undefined | jid:jid(),
-               resource = <<>> :: binary()}).
--type bind() :: #bind{}.
-
--record(jingle_ft_file, {date :: undefined | erlang:timestamp(),
-                         desc = [] :: [#text{}],
-                         hash = [] :: [#hash{}],
-                         'hash-used' :: 'undefined' | #hash_used{},
-                         'media-type' :: 'undefined' | binary(),
-                         name :: 'undefined' | binary(),
-                         size :: 'undefined' | non_neg_integer(),
-                         range :: 'undefined' | #jingle_ft_range{}}).
--type jingle_ft_file() :: #jingle_ft_file{}.
-
--record(jingle_ft_checksum, {creator :: 'initiator' | 'responder' | 'undefined',
-                             name = <<>> :: binary(),
-                             file :: #jingle_ft_file{}}).
--type jingle_ft_checksum() :: #jingle_ft_checksum{}.
-
--record(jingle_ft_description, {file :: 'undefined' | #jingle_ft_file{}}).
--type jingle_ft_description() :: #jingle_ft_description{}.
-
 -record(pubsub, {subscriptions :: 'undefined' | {binary(),[#ps_subscription{}]},
                  subscription :: 'undefined' | #ps_subscription{},
                  affiliations :: 'undefined' | {binary(),[#ps_affiliation{}]},
@@ -1400,6 +1336,88 @@
                  sub_els = [] :: [xmpp_element() | fxml:xmlel()]}).
 -type jingle() :: #jingle{}.
 
+-record(muc_subscription, {jid :: undefined | jid:jid(),
+                           nick = <<>> :: binary(),
+                           events = [] :: [binary()]}).
+-type muc_subscription() :: #muc_subscription{}.
+
+-record(muc_subscriptions, {list = [] :: [#muc_subscription{}]}).
+-type muc_subscriptions() :: #muc_subscriptions{}.
+
+-record(pubsub_owner, {affiliations :: 'undefined' | {binary(),[#ps_affiliation{}]},
+                       configure :: 'undefined' | {binary(),'undefined' | #xdata{}},
+                       default :: 'undefined' | {binary(),'undefined' | #xdata{}},
+                       delete :: 'undefined' | {binary(),binary()},
+                       purge :: 'undefined' | binary(),
+                       subscriptions :: 'undefined' | {binary(),[#ps_subscription{}]}}).
+-type pubsub_owner() :: #pubsub_owner{}.
+
+-record(receipt_request, {}).
+-type receipt_request() :: #receipt_request{}.
+
+-record(vcard_email, {home = false :: boolean(),
+                      work = false :: boolean(),
+                      internet = false :: boolean(),
+                      pref = false :: boolean(),
+                      x400 = false :: boolean(),
+                      userid :: 'undefined' | binary()}).
+-type vcard_email() :: #vcard_email{}.
+
+-record(vcard_temp, {version :: 'undefined' | binary(),
+                     fn :: 'undefined' | binary(),
+                     n :: 'undefined' | #vcard_name{},
+                     nickname :: 'undefined' | binary(),
+                     photo :: 'undefined' | #vcard_photo{},
+                     bday :: 'undefined' | binary(),
+                     adr = [] :: [#vcard_adr{}],
+                     label = [] :: [#vcard_label{}],
+                     tel = [] :: [#vcard_tel{}],
+                     email = [] :: [#vcard_email{}],
+                     jabberid :: 'undefined' | binary(),
+                     mailer :: 'undefined' | binary(),
+                     tz :: 'undefined' | binary(),
+                     geo :: 'undefined' | #vcard_geo{},
+                     title :: 'undefined' | binary(),
+                     role :: 'undefined' | binary(),
+                     logo :: 'undefined' | #vcard_logo{},
+                     org :: 'undefined' | #vcard_org{},
+                     categories = [] :: [binary()],
+                     note :: 'undefined' | binary(),
+                     prodid :: 'undefined' | binary(),
+                     rev :: 'undefined' | binary(),
+                     sort_string :: 'undefined' | binary(),
+                     sound :: 'undefined' | #vcard_sound{},
+                     uid :: 'undefined' | binary(),
+                     url :: 'undefined' | binary(),
+                     class :: 'confidential' | 'private' | 'public' | 'undefined',
+                     key :: 'undefined' | #vcard_key{},
+                     desc :: 'undefined' | binary(),
+                     sub_els = [] :: [xmpp_element() | fxml:xmlel()]}).
+-type vcard_temp() :: #vcard_temp{}.
+
+-record(privacy_query, {lists = [] :: [#privacy_list{}],
+                        default :: 'none' | 'undefined' | binary(),
+                        active :: 'none' | 'undefined' | binary()}).
+-type privacy_query() :: #privacy_query{}.
+
+-record(jingle_ft_file, {date :: undefined | erlang:timestamp(),
+                         desc = [] :: [#text{}],
+                         hash = [] :: [#hash{}],
+                         'hash-used' :: 'undefined' | #hash_used{},
+                         'media-type' :: 'undefined' | binary(),
+                         name :: 'undefined' | binary(),
+                         size :: 'undefined' | non_neg_integer(),
+                         range :: 'undefined' | #jingle_ft_range{}}).
+-type jingle_ft_file() :: #jingle_ft_file{}.
+
+-record(jingle_ft_checksum, {creator :: 'initiator' | 'responder' | 'undefined',
+                             name = <<>> :: binary(),
+                             file :: #jingle_ft_file{}}).
+-type jingle_ft_checksum() :: #jingle_ft_checksum{}.
+
+-record(jingle_ft_description, {file :: 'undefined' | #jingle_ft_file{}}).
+-type jingle_ft_description() :: #jingle_ft_description{}.
+
 -record(register, {registered = false :: boolean(),
                    remove = false :: boolean(),
                    instructions :: 'undefined' | binary(),
@@ -1424,21 +1442,12 @@
                    sub_els = [] :: [xmpp_element() | fxml:xmlel()]}).
 -type register() :: #register{}.
 
--record(muc_subscription, {jid :: undefined | jid:jid(),
-                           nick = <<>> :: binary(),
-                           events = [] :: [binary()]}).
--type muc_subscription() :: #muc_subscription{}.
-
--record(muc_subscriptions, {list = [] :: [#muc_subscription{}]}).
--type muc_subscriptions() :: #muc_subscriptions{}.
+-record(bind, {jid :: undefined | jid:jid(),
+               resource = <<>> :: binary()}).
+-type bind() :: #bind{}.
 
--record(pubsub_owner, {affiliations :: 'undefined' | {binary(),[#ps_affiliation{}]},
-                       configure :: 'undefined' | {binary(),'undefined' | #xdata{}},
-                       default :: 'undefined' | {binary(),'undefined' | #xdata{}},
-                       delete :: 'undefined' | {binary(),binary()},
-                       purge :: 'undefined' | binary(),
-                       subscriptions :: 'undefined' | {binary(),[#ps_subscription{}]}}).
--type pubsub_owner() :: #pubsub_owner{}.
+-record(rosterver_feature, {}).
+-type rosterver_feature() :: #rosterver_feature{}.
 
 -type xmpp_element() :: address() |
                         addresses() |
@@ -1491,7 +1500,9 @@
                         fasten_apply_to() |
                         fasten_external() |
                         feature_csi() |
+                        feature_pre_approval() |
                         feature_register() |
+                        feature_register_ibr_token() |
                         feature_sm() |
                         forwarded() |
                         gone() |
@@ -1583,6 +1594,7 @@
                         origin_id() |
                         pep_bookmarks_conference() |
                         ping() |
+                        preauth() |
                         presence() |
                         privacy_item() |
                         privacy_list() |

src/rfc6121.erl

@@ -5,6 +5,11 @@
 
 -compile(export_all).
 
+do_decode(<<"sub">>,
+          <<"urn:xmpp:features:pre-approval">>, El, Opts) ->
+    decode_feature_pre_approval(<<"urn:xmpp:features:pre-approval">>,
+                                Opts,
+                                El);
 do_decode(<<"ver">>, <<"urn:xmpp:features:rosterver">>,
           El, Opts) ->
     decode_rosterver_feature(<<"urn:xmpp:features:rosterver">>,
@@ -25,7 +30,8 @@ do_decode(Name, XMLNS, _, _) ->
     erlang:error({xmpp_codec, {unknown_tag, Name, XMLNS}}).
 
 tags() ->
-    [{<<"ver">>, <<"urn:xmpp:features:rosterver">>},
+    [{<<"sub">>, <<"urn:xmpp:features:pre-approval">>},
+     {<<"ver">>, <<"urn:xmpp:features:rosterver">>},
      {<<"query">>, <<"jabber:iq:roster">>},
      {<<"item">>, <<"jabber:iq:roster">>},
      {<<"group">>, <<"jabber:iq:roster">>}].
@@ -36,13 +42,18 @@ do_encode({roster_item, _, _, _, _, _, _} = Item,
 do_encode({roster_query, _, _, _} = Query, TopXMLNS) ->
     encode_roster_query(Query, TopXMLNS);
 do_encode({rosterver_feature} = Ver, TopXMLNS) ->
-    encode_rosterver_feature(Ver, TopXMLNS).
+    encode_rosterver_feature(Ver, TopXMLNS);
+do_encode({feature_pre_approval} = Sub, TopXMLNS) ->
+    encode_feature_pre_approval(Sub, TopXMLNS).
 
+do_get_name({feature_pre_approval}) -> <<"sub">>;
 do_get_name({roster_item, _, _, _, _, _, _}) ->
     <<"item">>;
 do_get_name({roster_query, _, _, _}) -> <<"query">>;
 do_get_name({rosterver_feature}) -> <<"ver">>.
 
+do_get_ns({feature_pre_approval}) ->
+    <<"urn:xmpp:features:pre-approval">>;
 do_get_ns({roster_item, _, _, _, _, _, _}) ->
     <<"jabber:iq:roster">>;
 do_get_ns({roster_query, _, _, _}) ->
@@ -54,12 +65,14 @@ pp(roster_item, 6) ->
     [jid, name, groups, subscription, ask, mix_channel];
 pp(roster_query, 3) -> [items, ver, mix_annotate];
 pp(rosterver_feature, 0) -> [];
+pp(feature_pre_approval, 0) -> [];
 pp(_, _) -> no.
 
 records() ->
     [{roster_item, 6},
      {roster_query, 3},
-     {rosterver_feature, 0}].
+     {rosterver_feature, 0},
+     {feature_pre_approval, 0}].
 
 dec_enum(Val, Enums) ->
     AtomVal = erlang:binary_to_existing_atom(Val, utf8),
@@ -69,6 +82,21 @@ dec_enum(Val, Enums) ->
 
 enc_enum(Atom) -> erlang:atom_to_binary(Atom, utf8).
 
+decode_feature_pre_approval(__TopXMLNS, __Opts,
+                            {xmlel, <<"sub">>, _attrs, _els}) ->
+    {feature_pre_approval}.
+
+encode_feature_pre_approval({feature_pre_approval},
+                            __TopXMLNS) ->
+    __NewTopXMLNS =
+        xmpp_codec:choose_top_xmlns(<<"urn:xmpp:features:pre-approval">>,
+                                    [],
+                                    __TopXMLNS),
+    _els = [],
+    _attrs = xmpp_codec:enc_xmlns_attrs(__NewTopXMLNS,
+                                        __TopXMLNS),
+    {xmlel, <<"sub">>, _attrs, _els}.
+
 decode_rosterver_feature(__TopXMLNS, __Opts,
                          {xmlel, <<"ver">>, _attrs, _els}) ->
     {rosterver_feature}.