Diff

plugins/mod_presence.lua @ 2230:aa830ab55bbc

Merge with 0.6.
author Waqas Hussain <waqas20@gmail.com>
date Thu, 26 Nov 2009 13:06:52 +0500
parent 2229:3b38ec879076
child 2259:22417227d2ce
line wrap: on
line diff
--- a/plugins/mod_presence.lua	Thu Nov 26 01:09:10 2009 +0000
+++ b/plugins/mod_presence.lua	Thu Nov 26 13:06:52 2009 +0500
@@ -200,9 +200,6 @@
 			rostermanager.roster_push(node, host, to_bare);
 		end
 		core_route_stanza(origin, stanza);
-		-- COMPAT: Some legacy clients keep displaying unsubscribed contacts as online unless an unavailable presence is sent:
-		send_presence_of_available_resources(node, host, to_bare, origin, core_route_stanza,
-			st.presence({ type="unavailable", from=from_bare, to=to_bare, id=stanza.attr.id }));
 	end
 	stanza.attr.from, stanza.attr.to = st_from, st_to;
 end
@@ -233,7 +230,7 @@
 				-- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too)
 			end
 		else
-			core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="unavailable"})); -- acknowledging receipt
+			core_route_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unavailable"})); -- acknowledging receipt
 			if not rostermanager.is_contact_pending_in(node, host, from_bare) then
 				if rostermanager.set_contact_pending_in(node, host, from_bare) then
 					sessionmanager.send_to_available_resources(node, host, stanza);