diff options
| author | Kim Alvefur <zash@zash.se> | 2016-06-12 20:06:30 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-06-12 20:06:30 +0200 |
| commit | 5d9768626dd51c4d979c4c0878b707a8b3dbc0fa (patch) | |
| tree | 5235f98e4c6c1576bf426af7bafd6cc45c32a411 /plugins | |
| parent | 927cc45854d2a118fff4988c69a9a6c62bbab070 (diff) | |
| parent | 71d98a3f41c5253f47895710c91bd5709de090c6 (diff) | |
| download | prosody-5d9768626dd51c4d979c4c0878b707a8b3dbc0fa.tar.gz prosody-5d9768626dd51c4d979c4c0878b707a8b3dbc0fa.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_pep.lua | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua index 896f3e78..46517b95 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.full_jid), actor = session.jid, id = id, session = session, item = st.clone(payload); }); return true; end |