From 39de480ad8e4ccce9c1ed14b483b3b58edd25473 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 9 Jun 2016 10:30:33 +0200 Subject: mod_pep: Include the bare user jid in event --- plugins/mod_pep.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'plugins') diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua index 896f3e78..01007a6d 100644 --- a/plugins/mod_pep.lua +++ b/plugins/mod_pep.lua @@ -47,11 +47,10 @@ local function subscription_presence(user_bare, recipient) end module:hook("pep-publish-item", function (event) - local session, node, id, item = event.session, event.node, event.id, event.item; + local session, bare, node, id, item = event.session, event.user, event.node, event.id, event.item; item.attr.xmlns = nil; local disable = #item.tags ~= 1 or #item.tags[1] == 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'}) :tag('items', {node=node}) @@ -183,7 +182,7 @@ module:hook("iq/bare/http://jabber.org/protocol/pubsub:pubsub", function(event) payload.attr.id = id; session.send(st.reply(stanza)); module:fire_event("pep-publish-item", { - node = node, actor = session.jid, id = id, session = session, item = st.clone(payload); + node = node, user = jid_bare(session.jid), actor = session.jid, id = id, session = session, item = st.clone(payload); }); return true; end -- cgit v1.2.3 From 331c8a1358f7add25142ada7f3293c289dafde0d Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 10 Jun 2016 14:55:05 +0200 Subject: mod_pep: Use correct field for full JID (thanks Milan*) --- plugins/mod_pep.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua index 01007a6d..46517b95 100644 --- a/plugins/mod_pep.lua +++ b/plugins/mod_pep.lua @@ -182,7 +182,7 @@ module:hook("iq/bare/http://jabber.org/protocol/pubsub:pubsub", function(event) payload.attr.id = id; session.send(st.reply(stanza)); module:fire_event("pep-publish-item", { - node = node, user = jid_bare(session.jid), actor = session.jid, id = id, session = session, item = st.clone(payload); + node = node, user = jid_bare(session.full_jid), actor = session.jid, id = id, session = session, item = st.clone(payload); }); return true; end -- cgit v1.2.3