Software / code / prosody
Changeset
9179:82fad995a149
util.pubsub: Pass "retract" as the type of such broadcasts
This moves some XEP-0060 awkwardness out of util.pubsub and into mod_pubsub
A retraction is broadcast in an <items> container, whereas most other
kinds of broadcasts are in a container with a name matching the 'kind'
attribute.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 16 Aug 2018 14:32:21 +0200 |
| parents | 9178:f226b7b5486b |
| children | 9180:cc68cb03f85e |
| files | plugins/mod_pep.lua plugins/mod_pubsub/mod_pubsub.lua util/pubsub.lua |
| diffstat | 3 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_pep.lua Thu Aug 16 06:05:11 2018 +0200 +++ b/plugins/mod_pep.lua Thu Aug 16 14:32:21 2018 +0200 @@ -124,6 +124,9 @@ local function get_broadcaster(username) local user_bare = jid_join(username, host); local function simple_broadcast(kind, node, jids, item) + if kind == "retract" then + kind = "items"; -- XEP-0060 signals retraction in an <items> container + end local message = st.message({ from = user_bare, type = "headline" }) :tag("event", { xmlns = xmlns_pubsub_event }) :tag(kind, { node = node });
--- a/plugins/mod_pubsub/mod_pubsub.lua Thu Aug 16 06:05:11 2018 +0200 +++ b/plugins/mod_pubsub/mod_pubsub.lua Thu Aug 16 14:32:21 2018 +0200 @@ -47,6 +47,10 @@ end function simple_broadcast(kind, node, jids, item, actor, node_obj) + if kind == "retract" then + kind = "items"; -- XEP-0060 signals retraction in an <items> container + end + if item then item = st.clone(item); item.attr.xmlns = nil; -- Clear the pubsub namespace
--- a/util/pubsub.lua Thu Aug 16 06:05:11 2018 +0200 +++ b/util/pubsub.lua Thu Aug 16 14:32:21 2018 +0200 @@ -523,7 +523,7 @@ end self.events.fire_event("item-retracted", { node = node, actor = actor, id = id }); if retract then - self.config.broadcaster("items", node, node_obj.subscribers, retract, actor, node_obj, self); + self.config.broadcaster("retract", node, node_obj.subscribers, retract, actor, node_obj, self); end return true end
