aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-01-21 03:26:04 +0000
committerMatthew Wild <mwild1@gmail.com>2014-01-21 03:26:04 +0000
commit4159b9cfe19ede5b674a3328944c4ca02de99cd7 (patch)
tree19584e158c81d91f0bc306d1969d355b454e21be /plugins
parented8030da5147e3ef3fdf13327e69a3a3f31e7dac (diff)
parent9498616c812b820d54e9e15372b9dafe9aa00a03 (diff)
downloadprosody-4159b9cfe19ede5b674a3328944c4ca02de99cd7.tar.gz
prosody-4159b9cfe19ede5b674a3328944c4ca02de99cd7.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_storage_sql2.lua7
-rw-r--r--plugins/muc/mod_muc.lua1
2 files changed, 6 insertions, 2 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