Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Bump xmpp version and fix revealed bugs

This commit is contained in:
Evgeny Khramtsov 2019-07-16 15:59:33 +03:00
parent f10de6439b
commit 4d877289fb
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rebar.config
View File

@ -24,7 +24,7 @@
{fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.1.1"}}}, {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.1.1"}}},
{stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.16"}}}, {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.16"}}},
{fast_xml, ".*", {git, "https://github.com/processone/fast_xml", "7fd02f3a2f"}}, {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"}}}, {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.19"}}},
{yconf, ".*", {git, "https://github.com/processone/yconf", "dfeaa7e"}}, {yconf, ".*", {git, "https://github.com/processone/yconf", "dfeaa7e"}},
{jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}}, {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},

9
src/mod_pubsub.erl
View File

@ -3238,11 +3238,12 @@ max_items(Host, Options) ->
binary(), [binary()]) -> [xdata_field()]. binary(), [binary()]) -> [xdata_field()].
get_configure_xfields(_Type, Options, Lang, Groups) -> get_configure_xfields(_Type, Options, Lang, Groups) ->
pubsub_node_config:encode( pubsub_node_config:encode(
lists:map( lists:filtermap(
fun({roster_groups_allowed, Value}) -> fun({roster_groups_allowed, Value}) ->
{roster_groups_allowed, Value, Groups}; {true, {roster_groups_allowed, Value, Groups}};
(Opt) -> ({sql, _}) -> false;
Opt ({rsm, _}) -> false;
(_) -> true
end, Options), end, Options),
Lang). Lang).

4
test/muc_tests.erl
View File

@ -638,7 +638,7 @@ voice_request_master(Config) ->
{roomnick, PeerNick}] = lists:sort(muc_request:decode(Fs)), {roomnick, PeerNick}] = lists:sort(muc_request:decode(Fs)),
ct:comment("Approving voice request"), ct:comment("Approving voice request"),
ApprovalFs = muc_request:encode([{jid, PeerJID}, {role, participant}, 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, send(Config, #message{to = Room, sub_els = [#xdata{type = submit,
fields = ApprovalFs}]}), fields = ApprovalFs}]}),
#muc_user{ #muc_user{
@ -1449,7 +1449,7 @@ config_voice_request_interval_master(Config) ->
#message{from = Room, type = normal} = recv_message(Config), #message{from = Room, type = normal} = recv_message(Config),
ct:comment("Deny voice request at first"), ct:comment("Deny voice request at first"),
Fs = muc_request:encode([{jid, PeerJID}, {role, participant}, 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, send(Config, #message{to = Room, sub_els = [#xdata{type = submit,
fields = Fs}]}), fields = Fs}]}),
put_event(Config, denied), put_event(Config, denied),