mod_bosh: Return true from send()

[prosody.git] / core / rostermanager.lua

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index b415c21ca8cb33e99c27a3c911215416da433e5c..59ba6579a24af27fe78470de5473bb4ff1347698 100644 (file)
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -18,6 +18,7 @@ local pairs, ipairs = pairs, ipairs;
 local tostring = tostring;
 
 local hosts = hosts;
+local bare_sessions = bare_sessions;
 
 local datamanager = require "util.datamanager"
 local st = require "util.stanza";
@@ -81,28 +82,29 @@ function roster_push(username, host, jid)
 end
 
 function load_roster(username, host)
-       log("debug", "load_roster: asked for: "..username.."@"..host);
+       local jid = username.."@"..host;
+       log("debug", "load_roster: asked for: "..jid);
+       local user = bare_sessions[jid];
        local roster;
-       if hosts[host] and hosts[host].sessions[username] then
-               roster = hosts[host].sessions[username].roster;
-               if not roster then
-                       log("debug", "load_roster: loading for new user: "..username.."@"..host);
-                       roster = datamanager.load(username, host, "roster") or {};
-                       if not roster[false] then roster[false] = { }; end
-                       roster[username.."@"..host] = nil;
-                       hosts[host].sessions[username].roster = roster;
-                       hosts[host].events.fire_event("roster-load", username, host, roster);
-               end
-               return roster;
+       if user then
+               roster = user.roster;
+               if roster then return roster; end
+               log("debug", "load_roster: loading for new user: "..username.."@"..host);
+       else -- Attempt to load roster for non-loaded user
+               log("debug", "load_roster: loading for offline user: "..username.."@"..host);
+       end
+       local data, err = datamanager.load(username, host, "roster");
+       roster = data or {};
+       if user then user.roster = roster; end
+       if not roster[false] then roster[false] = { broken = err or nil }; end
+       if roster[jid] then
+               roster[jid] = nil;
+               log("warn", "roster for "..jid.." has a self-contact");
        end
-       
-       -- Attempt to load roster for non-loaded user
-       log("debug", "load_roster: loading for offline user: "..username.."@"..host);
-       roster = datamanager.load(username, host, "roster") or {};
-       if not roster[false] then roster[false] = { }; end
-       roster[username.."@"..host] = nil;
-       hosts[host].events.fire_event("roster-load", username, host, roster);
-       return roster;
+       if not err then
+               hosts[host].events.fire_event("roster-load", username, host, roster);
+       end
+       return roster, err;
 end
 
 function save_roster(username, host, roster)
@@ -115,8 +117,15 @@ function save_roster(username, host, roster)
                --end
        end
        if roster then
-               if not roster[false] then roster[false] = {}; end
-               roster[false].version = (roster[false].version or 0) + 1;
+               local metadata = roster[false];
+               if not metadata then
+                       metadata = {};
+                       roster[false] = metadata;
+               end
+               if metadata.version ~= true then
+                       metadata.version = (metadata.version or 0) + 1;
+               end
+               if roster[false].broken then return nil, "Not saving broken roster" end
                return datamanager.store(username, host, "roster", roster);
        end
        log("warn", "save_roster: user had no roster to save");
@@ -181,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)