Bump xmpp version and fix revealed bugs

diff --git a/rebar.config b/rebar.config
index e4ea9bd946137b91bf5f94d65dc75f8aa6692a38..72d6c70593b6bf7ee8fc381c7164fa2e8b1ff06e 100644 (file)
--- 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 54ebdc7cfb1c140e338a01eee65ff8d19a6dd74d..137df086adc069bd2bf8de96debd84dac1091e7d 100644 (file)
--- 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 2eb52eb19075a8613231a6b8456fd817958c1631..028386d6bb0e3103359b5e1ed9200e0946fc6124 100644 (file)
--- 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),