diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-01-21 03:26:04 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-01-21 03:26:04 +0000 |
| commit | c891b3fd1d45a2cacbfce1744ebd25828d321810 (patch) | |
| tree | 19584e158c81d91f0bc306d1969d355b454e21be | |
| parent | 702c862df7561efd8a5efd773d92eafd1eedcdc0 (diff) | |
| parent | a41146bca04a5c71d2a070068872e37ca2ed9414 (diff) | |
| download | prosody-c891b3fd1d45a2cacbfce1744ebd25828d321810.tar.gz prosody-c891b3fd1d45a2cacbfce1744ebd25828d321810.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_storage_sql2.lua | 7 | ||||
| -rw-r--r-- | plugins/muc/mod_muc.lua | 1 | ||||
| -rwxr-xr-x | tools/ejabberd2prosody.lua | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua index b9e9d3ca..90e9ead0 100644 --- a/plugins/mod_storage_sql2.lua +++ b/plugins/mod_storage_sql2.lua @@ -222,9 +222,12 @@ function archive_store:append(username, key, when, with, value) end local user,store = username,self.store; return engine:transaction(function() - local key = key or uuid.generate(); + if key then + engine:delete("DELETE FROM `prosodyarchive` WHERE `host`=? AND `user`=? AND `store`=? AND `key`=?", host, user or "", store, key); + else + key = uuid.generate(); + end local t, value = serialize(value); - engine:delete("DELETE FROM `prosodyarchive` WHERE `host`=? AND `user`=? AND `store`=? AND KEY=?", host, user or "", store, key); engine:insert("INSERT INTO `prosodyarchive` (`host`, `user`, `store`, `when`, `with`, `key`, `type`, `value`) VALUES (?,?,?,?,?,?,?,?)", host, user or "", store, when, with, key, t, value); return key; end); 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 = ...; |