mod_bosh: Return true from send()

[prosody.git] / core / rostermanager.lua

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 285cf4f6b4d234b59be1760f29db3272f616760e..59ba6579a24af27fe78470de5473bb4ff1347698 100644 (file)
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -190,10 +190,22 @@ function process_inbound_unsubscribe(username, host, jid)
        end
 end
 
+local function _get_online_roster_subscription(jidA, jidB)
+       local user = bare_sessions[jidA];
+       local item = user and (user.roster[jidB] or { subscription = "none" });
+       return item and item.subscription;
+end
 function is_contact_subscribed(username, host, jid)
-       local roster = load_roster(username, host);
+       do
+               local selfjid = username.."@"..host;
+               local subscription = _get_online_roster_subscription(selfjid, jid);
+               if subscription then return (subscription == "both" or subscription == "from"); end
+               local subscription = _get_online_roster_subscription(jid, selfjid);
+               if subscription then return (subscription == "both" or subscription == "to"); end
+       end
+       local roster, err = load_roster(username, host);
        local item = roster[jid];
-       return item and (item.subscription == "from" or item.subscription == "both");
+       return item and (item.subscription == "from" or item.subscription == "both"), err;
 end
 
 function is_contact_pending_in(username, host, jid)