aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-07-29 18:11:37 +0100
committerMatthew Wild <mwild1@gmail.com>2009-07-29 18:11:37 +0100
commit041209a264222c8261ccff51df5f73bbbc23d6b8 (patch)
treee014c22f857a0d2e2f96e817efc59cf6d9642e15 /plugins
parent5dfe9cf891dc5becd805dfbad79653d9eb840001 (diff)
parent273fa0fd8ac62a9f877033c659596fac911b4717 (diff)
downloadprosody-041209a264222c8261ccff51df5f73bbbc23d6b8.tar.gz
prosody-041209a264222c8261ccff51df5f73bbbc23d6b8.zip
Merge with 0.5
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_pep.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua
index 8cc4aedf..768d4a4a 100644
--- a/plugins/mod_pep.lua
+++ b/plugins/mod_pep.lua
@@ -30,6 +30,7 @@ module:add_feature("http://jabber.org/protocol/pubsub#publish");
local function publish(session, node, item)
local disable = #item.tags ~= 1 or #item.tags[1].tags == 0;
+ if #item.tags == 0 then item.name = "retract"; end
local bare = session.username..'@'..session.host;
local stanza = st.message({from=bare, type='headline'})
:tag('event', {xmlns='http://jabber.org/protocol/pubsub#event'})
@@ -128,7 +129,7 @@ module:hook("iq/bare/http://jabber.org/protocol/pubsub:pubsub", function(event)
local payload = stanza.tags[1];
if payload.name == 'pubsub' then -- <pubsub xmlns='http://jabber.org/protocol/pubsub'>
payload = payload.tags[1];
- if payload and payload.name == 'publish' and payload.attr.node then -- <publish node='http://jabber.org/protocol/tune'>
+ if payload and (payload.name == 'publish' or payload.name == 'retract') and payload.attr.node then -- <publish node='http://jabber.org/protocol/tune'>
local node = payload.attr.node;
payload = payload.tags[1];
if payload then -- <item>