# HG changeset patch # User Florian Zeitz # Date 1291519163 -3600 # Node ID d6028f4eb610d46e953ec971525afd9e07022ec5 # Parent cef2d5dc65e3fbd5107b296aad73e672b394324e mod_pubsub: Support item retraction diff -r cef2d5dc65e3 -r d6028f4eb610 plugins/mod_pubsub.lua --- a/plugins/mod_pubsub.lua Sun Dec 05 02:46:08 2010 +0100 +++ b/plugins/mod_pubsub.lua Sun Dec 05 04:19:23 2010 +0100 @@ -76,7 +76,7 @@ :tag("pubsub", { xmlns = xmlns_pubsub }) :tag("create", { node = node }); end - origin.send(reply); + return origin.send(reply); end function handlers.set_subscribe(origin, stanza, subscribe) @@ -132,6 +132,24 @@ return origin.send(reply); end +function handlers.set_retract(origin, stanza, retract) + local node, notify = retract.attr.node, retract.attr.notify; + notify = (notify == "1") or (notify == "true"); + local item = retract:get_child("item"); + local id = item and item.attr.id + local reply, notifier; + if notify then + notifier = st.stanza("retract", { id = id }); + end + local ok, ret = service:retract(node, stanza.attr.from, id, notifier); + if ok then + reply = st.reply(stanza); + else + reply = pubsub_error_reply(stanza, ret); + end + return origin.send(reply); +end + function simple_broadcast(node, jids, item) local message = st.message({ from = module.host, type = "headline" }) :tag("event", { xmlns = xmlns_pubsub_event }) diff -r cef2d5dc65e3 -r d6028f4eb610 util/pubsub.lua --- a/util/pubsub.lua Sun Dec 05 02:46:08 2010 +0100 +++ b/util/pubsub.lua Sun Dec 05 04:19:23 2010 +0100 @@ -54,6 +54,18 @@ return true; end +function service:retract(node, actor, id, retract) + local node_obj = self.nodes[node]; + if (not node_obj) or (not node_obj.data[id]) then + return false, "item-not-found"; + end + node_obj.data[id] = nil; + if retract then + self.cb.broadcaster(node, node_obj.subscribers, retract); + end + return true +end + function service:get(node, actor, id) local node_obj = self.nodes[node]; if node_obj then