diff plugins/mod_admin_telnet.lua @ 6609:d2faaaca695d

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 27 Mar 2015 22:24:57 +0000
parents f2a7ad099e01
children e813e8cf6046
line wrap: on
line diff
--- a/plugins/mod_admin_telnet.lua	Fri Mar 27 22:19:44 2015 +0000
+++ b/plugins/mod_admin_telnet.lua	Fri Mar 27 22:24:57 2015 +0000
@@ -962,7 +962,7 @@
 	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
@@ -976,8 +976,8 @@
 	end
 	local print = self.session.print;
 	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";