mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.pubsub: Pass "retract" as the type of such broadcasts

Browse source 
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.
This commit is contained in:
Kim Alvefur 2018-08-16 14:32:21 +02:00
parent 16f48337f3
commit 98c9778cc7
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/mod_pep.lua
View file

@ -124,6 +124,9 @@ end
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 });

4
plugins/mod_pubsub/mod_pubsub.lua
View file

@ -47,6 +47,10 @@ local function create_simple_itemstore(node_config, node_name)
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

2
util/pubsub.lua
View file

@ -523,7 +523,7 @@ function service:retract(node, actor, id, retract)
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