diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-02-21 10:25:15 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-02-21 10:25:15 +0300 |
| commit | 0acc69e303d3fcb7558ec2759aba05d3d1347e3f (patch) | |
| tree | 7b449e6d4c1a52f6cf33d39487bae0a1269b2edb /src | |
| parent | Add 'negotiation_timeout' to the known options list (diff) | |
Use nicks in disco#items or disco#info report
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_muc_room.erl | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl index 417bd4a15..87ae28797 100644 --- a/src/mod_muc_room.erl +++ b/src/mod_muc_room.erl @@ -508,7 +508,7 @@ handle_event(_Event, StateName, StateData) -> {next_state, StateName, StateData}. handle_sync_event({get_disco_item, Filter, JID, Lang}, _From, StateName, StateData) -> - Len = ?DICT:size(StateData#state.users), + Len = ?DICT:size(StateData#state.nicks), Reply = case (Filter == all) or (Filter == Len) or ((Filter /= 0) and (Len /= 0)) of true -> get_roomdesc_reply(JID, StateData, @@ -3673,7 +3673,7 @@ process_iq_disco_info(_From, #iq{type = get, lang = Lang}, StateData) -> -spec iq_disco_info_extras(binary(), state()) -> xdata(). iq_disco_info_extras(Lang, StateData) -> Fs1 = [{description, (StateData#state.config)#config.description}, - {occupants, ?DICT:size(StateData#state.users)}, + {occupants, ?DICT:size(StateData#state.nicks)}, {contactjid, get_owners(StateData)}], Fs2 = case (StateData#state.config)#config.pubsub of Node when is_binary(Node), Node /= <<"">> -> @@ -3906,20 +3906,18 @@ get_roomdesc_tail(StateData, Lang) -> true -> <<"">>; _ -> translate:translate(Lang, <<"private, ">>) end, - Len = (?DICT):size(StateData#state.users), + Len = (?DICT):size(StateData#state.nicks), <<" (", Desc/binary, (integer_to_binary(Len))/binary, ")">>. -spec get_mucroom_disco_items(state()) -> disco_items(). get_mucroom_disco_items(StateData) -> - Items = lists:map( - fun({_LJID, Info}) -> - Nick = Info#user.nick, - #disco_item{jid = jid:make(StateData#state.room, - StateData#state.host, - Nick), - name = Nick} - end, - (?DICT):to_list(StateData#state.users)), + Items = ?DICT:fold( + fun(Nick, _, Acc) -> + [#disco_item{jid = jid:make(StateData#state.room, + StateData#state.host, + Nick), + name = Nick}|Acc] + end, [], StateData#state.nicks), #disco_items{items = Items}. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |