diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-05-28 12:44:50 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-05-28 12:44:50 +0100 |
| commit | 003b31a798e219bdcc3e316b3c7d89591ef3b12a (patch) | |
| tree | f78830676260961d1eaee4e06caa708d4653da69 | |
| parent | 584982206dcd97ea12c23f793e1403d0794fc4b6 (diff) | |
| parent | de783efad25172674d477833d50eb5d3526b7430 (diff) | |
| download | prosody-003b31a798e219bdcc3e316b3c7d89591ef3b12a.tar.gz prosody-003b31a798e219bdcc3e316b3c7d89591ef3b12a.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_admin_telnet.lua | 13 | ||||
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index 9761d2f3..66560d44 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -964,6 +964,19 @@ function def_env.muc:room(room_jid) 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 = {}; diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index 4fd71e87..3de59d35 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -576,6 +576,8 @@ local function initialize_session(session) 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 |