From da4f11269dfc8f0157c94aa9c5f8e3eb2c5bc134 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Wed, 25 Dec 2013 15:28:55 +0100
Subject: mod_storage_sql2: Include user, host and store in id lookup
---
plugins/mod_storage_sql2.lua | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua
index e03b1fd6..bec35292 100644
--- a/plugins/mod_storage_sql2.lua
+++ b/plugins/mod_storage_sql2.lua
@@ -256,14 +256,16 @@ local function archive_where(query, args, where)
end
end
local function archive_where_id_range(query, args, where)
+ local args_len = #args
-- Before or after specific item, exclusive
if query.after then -- keys better be unique!
- where[#where+1] = "`sort_id` > (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? LIMIT 1)"
- args[#args+1] = query.after
+ where[#where+1] = "`sort_id` > (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? AND `host` = ?`AND user` = ?`AND store` = ? LIMIT 1)"
+ args[args_len+1], args[args_len+2], args[args_len+3], args[args_len+4] = query.after, args[1], args[2], args[3];
+ args_len = args_len + 4
end
if query.before then
- where[#where+1] = "`sort_id` < (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? LIMIT 1)"
- args[#args+1] = query.before
+ where[#where+1] = "`sort_id` < (SELECT `sort_id` FROM `prosodyarchive` WHERE `key` = ? AND `host` = ?`AND user` = ?`AND store` = ? LIMIT 1)"
+ args[args_len+1], args[args_len+2], args[args_len+3], args[args_len+4] = query.before, args[1], args[2], args[3];
end
end
--
cgit v1.2.3
From 2a25194b55d76eca92bafb30a3bb57cbf0b3bc1e Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Wed, 25 Dec 2013 22:37:52 +0100
Subject: mod_storage_sql2: Expose the unique key argument, allowing arbitrary
ids. Conflicting items are removed.
---
plugins/mod_storage_sql2.lua | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua
index bec35292..a97bee58 100644
--- a/plugins/mod_storage_sql2.lua
+++ b/plugins/mod_storage_sql2.lua
@@ -216,11 +216,15 @@ end
local archive_store = {}
archive_store.__index = archive_store
-function archive_store:append(username, when, with, value)
+function archive_store:append(username, key, when, with, value)
+ if value == nil then -- COMPAT early versions
+ when, with, value, key = key, when, with, value
+ end
local user,store = username,self.store;
return engine:transaction(function()
- local key = uuid.generate();
+ local key = key or uuid.generate();
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);
--
cgit v1.2.3
From bd8154130f88a89bd4f548264f935afb5e773951 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Mon, 30 Dec 2013 21:49:17 +0100
Subject: mod_pubsub: Don't sent error replies from service disco events, let
mod_disco handle that
---
plugins/mod_pubsub/mod_pubsub.lua | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/plugins/mod_pubsub/mod_pubsub.lua b/plugins/mod_pubsub/mod_pubsub.lua
index 81a66f8b..c6dbe831 100644
--- a/plugins/mod_pubsub/mod_pubsub.lua
+++ b/plugins/mod_pubsub/mod_pubsub.lua
@@ -86,12 +86,9 @@ end
module:hook("host-disco-info-node", function (event)
local stanza, origin, reply, node = event.stanza, event.origin, event.reply, event.node;
local ok, ret = service:get_nodes(stanza.attr.from);
- if ok and not ret[node] then
+ if not ok or not ret[node] then
return;
end
- if not ok then
- return origin.send(pubsub_error_reply(stanza, ret));
- end
event.exists = true;
reply:tag("identity", { category = "pubsub", type = "leaf" });
end);
@@ -100,7 +97,7 @@ module:hook("host-disco-items-node", function (event)
local stanza, origin, reply, node = event.stanza, event.origin, event.reply, event.node;
local ok, ret = service:get_items(node, stanza.attr.from);
if not ok then
- return origin.send(pubsub_error_reply(stanza, ret));
+ return;
end
for id, item in pairs(ret) do
@@ -114,7 +111,7 @@ module:hook("host-disco-items", function (event)
local stanza, origin, reply = event.stanza, event.origin, event.reply;
local ok, ret = service:get_nodes(event.stanza.attr.from);
if not ok then
- return origin.send(pubsub_error_reply(event.stanza, ret));
+ return;
end
for node, node_obj in pairs(ret) do
reply:tag("item", { jid = module.host, node = node, name = node_obj.config.name }):up();
--
cgit v1.2.3
From dbe25f8d3325674034a5dabb8b98e888d88767ee Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 26 Dec 2013 18:14:34 +0100
Subject: util.pubsub: Fire events on more actions
---
util/pubsub.lua | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/util/pubsub.lua b/util/pubsub.lua
index 0dfd196b..a68b256c 100644
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -219,6 +219,7 @@ function service:create(node, actor)
data = {};
affiliations = {};
};
+ self.events.fire_event("node-created", { node = node, actor = actor });
local ok, err = self:set_affiliation(node, true, actor, "owner");
if not ok then
self.nodes[node] = nil;
@@ -237,6 +238,7 @@ function service:delete(node, actor)
return false, "item-not-found";
end
self.nodes[node] = nil;
+ self.events.fire_event("node-deleted", { node = node, actor = actor });
self.config.broadcaster("delete", node, node_obj.subscribers);
return true;
end
@@ -274,6 +276,7 @@ function service:retract(node, actor, id, retract)
if (not node_obj) or (not node_obj.data[id]) then
return false, "item-not-found";
end
+ self.events.fire_event("item-retracted", { node = node, actor = actor, id = id });
node_obj.data[id] = nil;
if retract then
self.config.broadcaster("items", node, node_obj.subscribers, retract);
@@ -292,6 +295,7 @@ function service:purge(node, actor, notify)
return false, "item-not-found";
end
node_obj.data = {}; -- Purge
+ self.events.fire_event("node-purged", { node = node, actor = actor });
if notify then
self.config.broadcaster("purge", node, node_obj.subscribers);
end
--
cgit v1.2.3
From c9a6cd1b3365ffb0676f542cc81ddecd4b46dbd0 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Mon, 30 Dec 2013 23:49:23 +0100
Subject: util.pubsub: Separate data from node configuration
---
util/pubsub.lua | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/util/pubsub.lua b/util/pubsub.lua
index a68b256c..fc67cb1f 100644
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -1,4 +1,5 @@
local events = require "util.events";
+local t_remove = table.remove;
module("pubsub", package.seeall);
@@ -18,6 +19,7 @@ function new(config)
affiliations = {};
subscriptions = {};
nodes = {};
+ data = {};
events = events.new();
}, service_mt);
end
@@ -212,17 +214,19 @@ function service:create(node, actor)
return false, "conflict";
end
+ self.data[node] = {};
self.nodes[node] = {
name = node;
subscribers = {};
config = {};
- data = {};
affiliations = {};
};
+ setmetatable(self.nodes[node], { __index = { data = self.data[node] } }); -- COMPAT
self.events.fire_event("node-created", { node = node, actor = actor });
local ok, err = self:set_affiliation(node, true, actor, "owner");
if not ok then
self.nodes[node] = nil;
+ self.data[node] = nil;
end
return ok, err;
end
@@ -238,11 +242,23 @@ function service:delete(node, actor)
return false, "item-not-found";
end
self.nodes[node] = nil;
+ self.data[node] = nil;
self.events.fire_event("node-deleted", { node = node, actor = actor });
self.config.broadcaster("delete", node, node_obj.subscribers);
return true;
end
+local function remove_item_by_id(data, id)
+ if not data[id] then return end
+ data[id] = nil;
+ for i, _id in ipairs(data) do
+ if id == _id then
+ t_remove(data, i);
+ return i;
+ end
+ end
+end
+
function service:publish(node, actor, id, item)
-- Access checking
if not self:may(node, actor, "publish") then
@@ -260,7 +276,10 @@ function service:publish(node, actor, id, item)
end
node_obj = self.nodes[node];
end
- node_obj.data[id] = item;
+ local node_data = self.data[node];
+ remove_item_by_id(node_data, id);
+ node_data[#self.data[node] + 1] = id;
+ node_data[id] = item;
self.events.fire_event("item-published", { node = node, actor = actor, id = id, item = item });
self.config.broadcaster("items", node, node_obj.subscribers, item);
return true;
@@ -273,11 +292,11 @@ function service:retract(node, actor, id, retract)
end
--
local node_obj = self.nodes[node];
- if (not node_obj) or (not node_obj.data[id]) then
+ if (not node_obj) or (not self.data[node][id]) then
return false, "item-not-found";
end
self.events.fire_event("item-retracted", { node = node, actor = actor, id = id });
- node_obj.data[id] = nil;
+ remove_item_by_id(self.data[node], id);
if retract then
self.config.broadcaster("items", node, node_obj.subscribers, retract);
end
@@ -294,7 +313,7 @@ function service:purge(node, actor, notify)
if not node_obj then
return false, "item-not-found";
end
- node_obj.data = {}; -- Purge
+ self.data[node] = {}; -- Purge
self.events.fire_event("node-purged", { node = node, actor = actor });
if notify then
self.config.broadcaster("purge", node, node_obj.subscribers);
@@ -313,9 +332,9 @@ function service:get_items(node, actor, id)
return false, "item-not-found";
end
if id then -- Restrict results to a single specific item
- return true, { [id] = node_obj.data[id] };
+ return true, { id, [id] = self.data[node][id] };
else
- return true, node_obj.data;
+ return true, self.data[node];
end
end
--
cgit v1.2.3