aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_admin_telnet.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-25 20:37:51 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-25 20:37:51 +0100
commitf9884fa773f3d56f098218729578b48da374342d (patch)
tree0f587a95354aa54cd7e6365fde97fb1050c6c7da /plugins/mod_admin_telnet.lua
parenta54b454be17169b6d377a602d284e654c3e3c6be (diff)
parentb88179151e3fdaaebd542ced76308e38f2acf0df (diff)
downloadprosody-f9884fa773f3d56f098218729578b48da374342d.tar.gz
prosody-f9884fa773f3d56f098218729578b48da374342d.zip
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_admin_telnet.lua')
-rw-r--r--plugins/mod_admin_telnet.lua14
1 files changed, 12 insertions, 2 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index e1b90684..2622a5f9 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -903,13 +903,23 @@ local console_room_mt = {
end;
};
-function def_env.muc:room(room_jid)
- local room_name, host = jid_split(room_jid);
+local function check_muc(jid)
+ local room_name, host = jid_split(jid);
if not hosts[host] then
return nil, "No such host: "..host;
elseif not hosts[host].modules.muc then
return nil, "Host '"..host.."' is not a MUC service";
end
+ return room_name, host;
+end
+
+function def_env.muc:create(room_jid)
+ local room, host = check_muc(room_jid);
+ return hosts[host].modules.muc.create_room(room_jid);
+end
+
+function def_env.muc:room(room_jid)
+ local room_name, host = check_muc(room_jid);
local room_obj = hosts[host].modules.muc.rooms[room_jid];
if not room_obj then
return nil, "No such room: "..room_jid;