diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2016-11-12 13:27:15 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2016-11-12 13:27:15 +0300 |
| commit | 78a44e01762e00102f5e3e3f0b49690cc7866c31 (patch) | |
| tree | b8ac7773f510ee3c1da4802bce2badc71c34c0b2 /include/xmpp_codec.hrl | |
| parent | Add more tests for offline storage (diff) | |
| parent | Support several groups separated by ; in add_rosteritem command (diff) | |
Merge branch 'master' into xml-ng
Conflicts:
src/adhoc.erl
src/cyrsasl_oauth.erl
src/ejabberd_c2s.erl
src/ejabberd_config.erl
src/ejabberd_service.erl
src/gen_mod.erl
src/mod_admin_extra.erl
src/mod_announce.erl
src/mod_carboncopy.erl
src/mod_client_state.erl
src/mod_configure.erl
src/mod_echo.erl
src/mod_mam.erl
src/mod_muc.erl
src/mod_muc_room.erl
src/mod_offline.erl
src/mod_pubsub.erl
src/mod_stats.erl
src/node_flat_sql.erl
src/randoms.erl
Diffstat (limited to 'include/xmpp_codec.hrl')
| -rw-r--r-- | include/xmpp_codec.hrl | 51 |
1 files changed, 38 insertions, 13 deletions
diff --git a/include/xmpp_codec.hrl b/include/xmpp_codec.hrl index 443769bb7..981f7f4c2 100644 --- a/include/xmpp_codec.hrl +++ b/include/xmpp_codec.hrl @@ -146,6 +146,10 @@ height :: non_neg_integer()}). -type thumbnail() :: #thumbnail{}. +-record(privilege_perm, {access :: 'message' | 'presence' | 'roster', + type :: 'both' | 'get' | 'managed_entity' | 'none' | 'outgoing' | 'roster' | 'set'}). +-type privilege_perm() :: #privilege_perm{}. + -record(muc_decline, {reason = <<>> :: binary(), from :: jid:jid(), to :: jid:jid()}). @@ -176,6 +180,14 @@ -record(starttls_proceed, {}). -type starttls_proceed() :: #starttls_proceed{}. +-record(forwarded, {delay :: #delay{}, + sub_els = [] :: [xmpp_element() | fxml:xmlel()]}). +-type forwarded() :: #forwarded{}. + +-record(privilege, {perms = [] :: [#privilege_perm{}], + forwarded :: #forwarded{}}). +-type privilege() :: #privilege{}. + -record(client_id, {id = <<>> :: binary()}). -type client_id() :: #client_id{}. @@ -184,10 +196,6 @@ xmlns = <<>> :: binary()}). -type sm_resumed() :: #sm_resumed{}. --record(forwarded, {delay :: #delay{}, - sub_els = [] :: [xmpp_element() | fxml:xmlel()]}). --type forwarded() :: #forwarded{}. - -record(sm_enable, {max :: non_neg_integer(), resume = false :: boolean(), xmlns = <<>> :: binary()}). @@ -215,6 +223,10 @@ -record(private, {xml_els = [] :: [fxml:xmlel()]}). -type private() :: #private{}. +-record(delegation_query, {to :: jid:jid(), + delegate = [] :: [binary()]}). +-type delegation_query() :: #delegation_query{}. + -record(db_verify, {from = <<>> :: binary(), to = <<>> :: binary(), id = <<>> :: binary(), @@ -534,6 +546,10 @@ continue :: binary()}). -type muc_invite() :: #muc_invite{}. +-record(delegated, {ns = <<>> :: binary(), + attrs = [] :: [binary()]}). +-type delegated() :: #delegated{}. + -record(carbons_disable, {}). -type carbons_disable() :: #carbons_disable{}. @@ -838,6 +854,10 @@ sub_els = [] :: [xmpp_element() | fxml:xmlel()]}). -type stanza_error() :: #stanza_error{}. +-record(delegation, {delegated = [] :: [#delegated{}], + forwarded :: #forwarded{}}). +-type delegation() :: #delegation{}. + -record(mix_join, {jid :: jid:jid(), subscribe = [] :: [binary()]}). -type mix_join() :: #mix_join{}. @@ -905,21 +925,18 @@ utc :: erlang:timestamp()}). -type time() :: #time{}. --type xmpp_element() :: muc_admin() | - compression() | +-type xmpp_element() :: compression() | ps_subscription() | xdata_option() | version() | - ps_affiliation() | - mam_fin() | sm_a() | bob_data() | media() | stanza_id() | starttls_proceed() | + forwarded() | client_id() | sm_resumed() | - forwarded() | xevent() | privacy_list() | carbons_sent() | @@ -932,6 +949,7 @@ mix_participant() | compressed() | block_list() | + delegated() | rsm_set() | 'see-other-host'() | hint() | @@ -953,10 +971,10 @@ compress() | bytestreams() | adhoc_actions() | + privacy_query() | muc_history() | identity() | feature_csi() | - privacy_query() | delay() | thumbnail() | vcard_tel() | @@ -993,6 +1011,7 @@ nick() | p1_ack() | block() | + delegation() | mix_join() | xmpp_session() | xdata() | @@ -1014,6 +1033,7 @@ adhoc_command() | sm_failed() | ping() | + privilege_perm() | privacy_item() | disco_item() | ps_item() | @@ -1027,12 +1047,13 @@ sic() | ps_options() | starttls() | + db_verify() | + roster_query() | media_uri() | muc_destroy() | vcard_key() | csi() | - db_verify() | - roster_query() | + delegation_query() | mam_query() | bookmark_url() | vcard_email() | @@ -1051,6 +1072,7 @@ carbons_private() | mix_leave() | muc_subscribe() | + privilege() | muc_unique() | sasl_response() | message() | @@ -1064,4 +1086,7 @@ sasl_auth() | p1_push() | oob_x() | - unblock(). + unblock() | + muc_admin() | + ps_affiliation() | + mam_fin(). |