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

Always display room's xdata in disco#info

This commit is contained in:
Evgeniy Khramtsov 2018-06-01 09:07:16 +03:00
parent cab8005bf3
commit 4337300fce
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mod_muc_room.erl
View File

@ -3827,7 +3827,7 @@ process_iq_disco_info(From, #iq{type = get, lang = Lang,
sub_els = [#disco_info{node = <<>>}]}, sub_els = [#disco_info{node = <<>>}]},
StateData) -> StateData) ->
DiscoInfo = make_disco_info(From, StateData), DiscoInfo = make_disco_info(From, StateData),
Extras = iq_disco_info_extras(Lang, StateData), Extras = iq_disco_info_extras(Lang, StateData, false),
{result, DiscoInfo#disco_info{xdata = [Extras]}}; {result, DiscoInfo#disco_info{xdata = [Extras]}};
process_iq_disco_info(From, #iq{type = get, lang = Lang, process_iq_disco_info(From, #iq{type = get, lang = Lang,
sub_els = [#disco_info{node = Node}]}, sub_els = [#disco_info{node = Node}]},
@ -3837,16 +3837,16 @@ process_iq_disco_info(From, #iq{type = get, lang = Lang,
DiscoInfo = make_disco_info(From, StateData), DiscoInfo = make_disco_info(From, StateData),
Hash = mod_caps:compute_disco_hash(DiscoInfo, sha), Hash = mod_caps:compute_disco_hash(DiscoInfo, sha),
Node = <<(?EJABBERD_URI)/binary, $#, Hash/binary>>, Node = <<(?EJABBERD_URI)/binary, $#, Hash/binary>>,
{result, DiscoInfo#disco_info{node = Node}} Extras = iq_disco_info_extras(Lang, StateData, true),
{result, DiscoInfo#disco_info{node = Node, xdata = [Extras]}}
catch _:{badmatch, _} -> catch _:{badmatch, _} ->
Txt = <<"Invalid node name">>, Txt = <<"Invalid node name">>,
{error, xmpp:err_item_not_found(Txt, Lang)} {error, xmpp:err_item_not_found(Txt, Lang)}
end. end.
-spec iq_disco_info_extras(binary(), state()) -> xdata(). -spec iq_disco_info_extras(binary(), state(), boolean()) -> xdata().
iq_disco_info_extras(Lang, StateData) -> iq_disco_info_extras(Lang, StateData, Static) ->
Fs1 = [{description, (StateData#state.config)#config.description}, Fs1 = [{description, (StateData#state.config)#config.description},
{occupants, ?DICT:size(StateData#state.nicks)},
{contactjid, get_owners(StateData)}, {contactjid, get_owners(StateData)},
{changesubject, (StateData#state.config)#config.allow_change_subj}, {changesubject, (StateData#state.config)#config.allow_change_subj},
{lang, (StateData#state.config)#config.lang}], {lang, (StateData#state.config)#config.lang}],
@ -3856,8 +3856,14 @@ iq_disco_info_extras(Lang, StateData) ->
_ -> _ ->
Fs1 Fs1
end, end,
Fs3 = case Static of
false ->
[{occupants, ?DICT:size(StateData#state.nicks)}|Fs2];
true ->
Fs2
end,
#xdata{type = result, #xdata{type = result,
fields = muc_roominfo:encode(Fs2, Lang)}. fields = muc_roominfo:encode(Fs3, Lang)}.
-spec process_iq_disco_items(jid(), iq(), state()) -> -spec process_iq_disco_items(jid(), iq(), state()) ->
{error, stanza_error()} | {result, disco_items()}. {error, stanza_error()} | {result, disco_items()}.