Software / code / prosody
Changeset
6261:be8eab694d6c
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 28 May 2014 12:44:50 +0100 |
| parents | 6258:8a01bce29834 (current diff) 6260:6986ca575568 (diff) |
| children | 6262:e24027bafb0e |
| files | |
| diffstat | 2 files changed, 15 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_admin_telnet.lua Sat May 24 01:27:09 2014 +0200 +++ b/plugins/mod_admin_telnet.lua Wed May 28 12:44:50 2014 +0100 @@ -964,6 +964,19 @@ return setmetatable({ room = room_obj }, console_room_mt); end +function def_env.muc:list(host) + local host_session = hosts[host]; + if not host_session or not host_session.modules.muc then + return nil, "Please supply the address of a local MUC component"; + end + local c = 0; + for name in keys(host_session.modules.muc.rooms) do + print(name); + c = c + 1; + end + return true, c.." rooms"; +end + local um = require"core.usermanager"; def_env.user = {};
--- a/plugins/mod_s2s/mod_s2s.lua Sat May 24 01:27:09 2014 +0200 +++ b/plugins/mod_s2s/mod_s2s.lua Wed May 28 12:44:50 2014 +0100 @@ -576,6 +576,8 @@ return handlestanza(session, stanza); end + module:fire_event("s2s-created", { session = session }); + add_task(connect_timeout, function () if session.type == "s2sin" or session.type == "s2sout" then return; -- Ok, we're connected
