# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1244380776 -3600
# Node ID 0709c9564b1c0daf99aaf3d10b1cf310db8aaca9
# Parent  20285e9d71ee6c114eb5a56ff7706c562a5d0dd1# Parent  33d103b0283f5b8d1789e7bf36885548035a04d9
Automated merge with http://waqas.ath.cx:8000/

diff -r 33d103b0283f -r 0709c9564b1c core/modulemanager.lua
diff -r 33d103b0283f -r 0709c9564b1c plugins/mod_pep.lua
--- a/plugins/mod_pep.lua	Sat Jun 06 21:29:34 2009 +0100
+++ b/plugins/mod_pep.lua	Sun Jun 07 14:19:36 2009 +0100
@@ -6,6 +6,10 @@
 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 @@
 			: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 @@
 	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 @@
 			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);