diff options
| -rw-r--r-- | plugins/mod_pep.lua | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua index 438b077d..0c360b38 100644 --- a/plugins/mod_pep.lua +++ b/plugins/mod_pep.lua @@ -6,6 +6,10 @@ local hosts = hosts; local user_exists = require "core.usermanager".user_exists; local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed; local pairs, ipairs = pairs, ipairs; +local load_roster = require "core.rostermanager".load_roster; + +local data = {}; +local recipients = {}; local function publish(session, node, item) local stanza = st.message({from=session.full_jid, type='headline'}) @@ -15,8 +19,14 @@ local function publish(session, node, item) :up() :up(); + local bare = session.username..'@'..session.host; + -- store for the future + local user_data = data[bare]; + if not user_data then user_data = {}; data[bare] = user_data; end + user_data[node] = stanza; + -- broadcast to resources - stanza.attr.to = session.username..'@'..session.host; + stanza.attr.to = bare; core_route_stanza(session, stanza); -- broadcast to contacts @@ -28,6 +38,31 @@ local function publish(session, node, item) end end +module:hook("presence/bare", function(data) + -- inbound presence to bare JID recieved + local origin, stanza = data.origin, data.stanza; + + local user = stanza.attr.to or (origin.username..'@'..origin.host); + local bare = jid_bare(stanza.attr.from); + local item = load_roster(jid_split(user))[bare]; + if not stanza.attr.to or (item and (item.subscription == 'from' or item.subscription == 'both')) then + local t = stanza.attr.type; + local recipient = stanza.attr.from; + if t == "unavailable" or t == "error" then + if recipients[user] then recipients[user][recipient] = nil; end + elseif not t then + recipients[user] = recipients[user][recipient] or {}; + if not recipients[user][recipient] then + recipients[user][recipient] = true; + for node, message in pairs(data[user] or {}) do + message.attr.to = stanza.attr.from; + origin.send(message); + end + end + end + end +end, 10); + module:add_iq_handler("c2s", "http://jabber.org/protocol/pubsub", function (session, stanza) if stanza.attr.type == 'set' and (not stanza.attr.to or jid_bare(stanza.attr.from) == stanza.attr.to) then local payload = stanza.tags[1]; @@ -43,6 +78,6 @@ module:add_iq_handler("c2s", "http://jabber.org/protocol/pubsub", function (sess end -- TODO else error end end - origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); + session.send(st.error_reply(stanza, "cancel", "service-unavailable")); end); |