diff options
| author | Kim Alvefur <zash@zash.se> | 2014-09-11 01:17:56 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-09-11 01:17:56 +0200 |
| commit | 43df3959ab0c8801cb39c1d7eba96af8a3785064 (patch) | |
| tree | 147e215854eea3b4657112876b5c45863c73acc8 /plugins/mod_admin_telnet.lua | |
| parent | f41908a42c7e4f8397b52536e5e32c771b07a096 (diff) | |
| parent | 534a115ec7aff123fa3358c500554d02b247e4a8 (diff) | |
| download | prosody-43df3959ab0c8801cb39c1d7eba96af8a3785064.tar.gz prosody-43df3959ab0c8801cb39c1d7eba96af8a3785064.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_admin_telnet.lua')
| -rw-r--r-- | plugins/mod_admin_telnet.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index a17b1c57..55eb2e55 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -961,7 +961,7 @@ function def_env.muc:room(room_jid) if not room_name then return room_name, host; end - local room_obj = hosts[host].modules.muc.rooms[room_jid]; + local room_obj = hosts[host].modules.muc.get_room_from_jid(room_jid); if not room_obj then return nil, "No such room: "..room_jid; end @@ -974,8 +974,8 @@ function def_env.muc:list(host) return nil, "Please supply the address of a local MUC component"; end local c = 0; - for name in keys(host_session.modules.muc.rooms) do - print(name); + for room in host_session.modules.muc.each_room() do + print(room.jid); c = c + 1; end return true, c.." rooms"; |