# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1274643435 -18000
# Node ID c311fdffccce6c32ef3492631cc67a2785c54175
# Parent  826cb5f1859b32eecffe730f0c632a37105277ea
mod_presence: Don't send 'unsubscribed' in response to probes when roster loading fails.

diff -r 826cb5f1859b -r c311fdffccce plugins/mod_presence.lua
--- a/plugins/mod_presence.lua	Mon May 24 00:35:08 2010 +0500
+++ b/plugins/mod_presence.lua	Mon May 24 00:37:15 2010 +0500
@@ -228,11 +228,12 @@
 	log("debug", "inbound presence "..stanza.attr.type.." from "..from_bare.." for "..to_bare);
 	
 	if stanza.attr.type == "probe" then
-		if rostermanager.is_contact_subscribed(node, host, from_bare) then
+		local result, err = rostermanager.is_contact_subscribed(node, host, from_bare);
+		if result then
 			if 0 == send_presence_of_available_resources(node, host, st_from, origin, core_route_stanza) then
 				core_route_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unavailable"})); -- TODO send last activity
 			end
-		else
+		elseif not err then
 			core_route_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unsubscribed"}));
 		end
 	elseif stanza.attr.type == "subscribe" then