prosody
78bc91f0d74b
plugins/mod_admin_telnet.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

plugins/mod_admin_telnet.lua @ 5631:78bc91f0d74b

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 26 May 2013 22:59:06 +0200
parent 5599:34e9f237b915
parent 5630:5f3c0b11aa88
child 5645:ae079d57af2e
comparison
equal deleted inserted replaced
5629:2427c81da16c 5631:78bc91f0d74b
938 return room_name, host; 938 return room_name, host;
939 end 939 end
940 940
941 function def_env.muc:create(room_jid) 941 function def_env.muc:create(room_jid)
942 local room, host = check_muc(room_jid); 942 local room, host = check_muc(room_jid);
943 if not room then return nil, host end
944 if hosts[host].modules.muc.rooms[room_jid] then return nil, "Room exists already" end
943 return hosts[host].modules.muc.create_room(room_jid); 945 return hosts[host].modules.muc.create_room(room_jid);
944 end 946 end
945 947
946 function def_env.muc:room(room_jid) 948 function def_env.muc:room(room_jid)
947 local room_name, host = check_muc(room_jid); 949 local room_name, host = check_muc(room_jid);