Mercurial > prosody-hg

comparison plugins/mod_admin_telnet.lua @ 6609:d2faaaca695d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 27 Mar 2015 22:24:57 +0000
parents f2a7ad099e01
children e813e8cf6046
comparison
equal deleted inserted replaced
6608:b6e558febb7a 6609:d2faaaca695d
960 function def_env.muc:room(room_jid) 960 function def_env.muc:room(room_jid)
961 local room_name, host = check_muc(room_jid); 961 local room_name, host = check_muc(room_jid);
962 if not room_name then 962 if not room_name then
963 return room_name, host; 963 return room_name, host;
964 end 964 end
965 local room_obj = hosts[host].modules.muc.rooms[room_jid]; 965 local room_obj = hosts[host].modules.muc.get_room_from_jid(room_jid);
966 if not room_obj then 966 if not room_obj then
967 return nil, "No such room: "..room_jid; 967 return nil, "No such room: "..room_jid;
968 end 968 end
969 return setmetatable({ room = room_obj }, console_room_mt); 969 return setmetatable({ room = room_obj }, console_room_mt);
970 end 970 end
974 if not host_session or not host_session.modules.muc then 974 if not host_session or not host_session.modules.muc then
975 return nil, "Please supply the address of a local MUC component"; 975 return nil, "Please supply the address of a local MUC component";
976 end 976 end
977 local print = self.session.print; 977 local print = self.session.print;
978 local c = 0; 978 local c = 0;
979 for name in keys(host_session.modules.muc.rooms) do 979 for room in host_session.modules.muc.each_room() do
980 print(name); 980 print(room.jid);
981 c = c + 1; 981 c = c + 1;
982 end 982 end
983 return true, c.." rooms"; 983 return true, c.." rooms";
984 end 984 end
985 985