diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-01-21 03:24:40 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-01-21 03:24:40 +0000 |
| commit | 9498616c812b820d54e9e15372b9dafe9aa00a03 (patch) | |
| tree | a140d1b5fda6c0f799587ec5e400666684898b3a | |
| parent | 9550295c9d54f962435836dffc708bba67feaad5 (diff) | |
| parent | 611b2eb4ed27c21f06dda681e63b4cf680cb1a98 (diff) | |
| download | prosody-9498616c812b820d54e9e15372b9dafe9aa00a03.tar.gz prosody-9498616c812b820d54e9e15372b9dafe9aa00a03.zip | |
Merge 0.9->0.10
| -rw-r--r-- | plugins/muc/mod_muc.lua | 1 | ||||
| -rwxr-xr-x | tools/ejabberd2prosody.lua | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua index 7bb1d8b2..c514bafd 100644 --- a/plugins/muc/mod_muc.lua +++ b/plugins/muc/mod_muc.lua @@ -173,6 +173,7 @@ function stanza_handler(event) if room then room:handle_stanza(origin, stanza); if not next(room._occupants) and not persistent_rooms[room.jid] then -- empty, non-persistent room + module:fire_event("muc-room-destroyed", { room = room }); rooms[bare] = nil; -- discard room end else diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua index 4bc15eb7..8297278f 100755 --- a/tools/ejabberd2prosody.lua +++ b/tools/ejabberd2prosody.lua @@ -30,7 +30,7 @@ dm.set_data_path("data"); function build_stanza(tuple, stanza) assert(type(tuple) == "table", "XML node is of unexpected type: "..type(tuple)); - if tuple[1] == "xmlelement" then + if tuple[1] == "xmlelement" or tuple[1] == "xmlel" then assert(type(tuple[2]) == "string", "element name has type: "..type(tuple[2])); assert(type(tuple[3]) == "table", "element attribute array has type: "..type(tuple[3])); assert(type(tuple[4]) == "table", "element children array has type: "..type(tuple[4])); @@ -247,7 +247,7 @@ local filters = { end muc_room(tuple[2][1], tuple[2][2], properties); end; - config = function(tuple) + --[=[config = function(tuple) if tuple[2] == "hosts" then local output = io.output(); io.output("prosody.cfg.lua"); io.write("-- Configuration imported from ejabberd --\n"); @@ -275,7 +275,7 @@ local filters = { io.output(output); print("prosody.cfg.lua created"); end - end; + end;]=] }; local arg = ...; |