aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-05-26 22:58:13 +0200
committerKim Alvefur <zash@zash.se>2013-05-26 22:58:13 +0200
commita59ace83df2910acc183c64f8ee550c602b8dfa3 (patch)
tree7fcf81b4cf555a155dd89823da3618aff5160132 /plugins
parentd162fd9921ce280027b1d2466f2a1f1d330347a6 (diff)
downloadprosody-a59ace83df2910acc183c64f8ee550c602b8dfa3.tar.gz
prosody-a59ace83df2910acc183c64f8ee550c602b8dfa3.zip
mod_admin_telnet: Make the muc:create() command complain if the room already exists
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_admin_telnet.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 3d149623..d8dd9951 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -922,6 +922,8 @@ end
function def_env.muc:create(room_jid)
local room, host = check_muc(room_jid);
+ if not room then return nil, host end
+ if hosts[host].modules.muc.rooms[room_jid] then return nil, "Room exists already" end
return hosts[host].modules.muc.create_room(room_jid);
end