diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-07-16 15:59:33 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-07-16 15:59:33 +0300 |
| commit | 4d877289fb9f1ff6f89bc3f13901dc5f9e35c9aa (patch) | |
| tree | 9a67c5da962309015c769ee8552769bcec24c6e2 | |
| parent | Fix 'get-pending' command form generation (diff) | |
Bump xmpp version and fix revealed bugs
| -rw-r--r-- | rebar.config | 2 | ||||
| -rw-r--r-- | src/mod_pubsub.erl | 9 | ||||
| -rw-r--r-- | test/muc_tests.erl | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/rebar.config b/rebar.config index e4ea9bd9..72d6c705 100644 --- a/rebar.config +++ b/rebar.config @@ -24,7 +24,7 @@ {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.1.1"}}}, {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.16"}}}, {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", "7fd02f3a2f"}}, - {xmpp, ".*", {git, "https://github.com/processone/xmpp", "b704d84"}}, + {xmpp, ".*", {git, "https://github.com/processone/xmpp", "31413d7"}}, {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.19"}}}, {yconf, ".*", {git, "https://github.com/processone/yconf", "dfeaa7e"}}, {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}}, diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl index 54ebdc7c..137df086 100644 --- a/src/mod_pubsub.erl +++ b/src/mod_pubsub.erl @@ -3238,11 +3238,12 @@ max_items(Host, Options) -> binary(), [binary()]) -> [xdata_field()]. get_configure_xfields(_Type, Options, Lang, Groups) -> pubsub_node_config:encode( - lists:map( + lists:filtermap( fun({roster_groups_allowed, Value}) -> - {roster_groups_allowed, Value, Groups}; - (Opt) -> - Opt + {true, {roster_groups_allowed, Value, Groups}}; + ({sql, _}) -> false; + ({rsm, _}) -> false; + (_) -> true end, Options), Lang). diff --git a/test/muc_tests.erl b/test/muc_tests.erl index 2eb52eb1..028386d6 100644 --- a/test/muc_tests.erl +++ b/test/muc_tests.erl @@ -638,7 +638,7 @@ voice_request_master(Config) -> {roomnick, PeerNick}] = lists:sort(muc_request:decode(Fs)), ct:comment("Approving voice request"), ApprovalFs = muc_request:encode([{jid, PeerJID}, {role, participant}, - {nick, PeerNick}, {request_allow, true}]), + {roomnick, PeerNick}, {request_allow, true}]), send(Config, #message{to = Room, sub_els = [#xdata{type = submit, fields = ApprovalFs}]}), #muc_user{ @@ -1449,7 +1449,7 @@ config_voice_request_interval_master(Config) -> #message{from = Room, type = normal} = recv_message(Config), ct:comment("Deny voice request at first"), Fs = muc_request:encode([{jid, PeerJID}, {role, participant}, - {nick, PeerNick}, {request_allow, false}]), + {roomnick, PeerNick}, {request_allow, false}]), send(Config, #message{to = Room, sub_els = [#xdata{type = submit, fields = Fs}]}), put_event(Config, denied), |