Fix for never checking if the first module for a host is already loaded (affects...

[prosody.git] / core / rostermanager.lua

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index ffc4f481dc003bc042aee87464f89d296740f0f5..7236a006fc0033f09efb36d9a34783d141c7ae69 100644 (file)
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -1,8 +1,15 @@
+-- Prosody IM v0.3
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
 
-local mainlog = log;
-local function log(type, message)
-       mainlog(type, "rostermanager", message);
-end
+
+
+
+local log = require "util.logger".init("rostermanager");
 
 local setmetatable = setmetatable;
 local format = string.format;
@@ -11,9 +18,7 @@ local pairs, ipairs = pairs, ipairs;
 
 local hosts = hosts;
 
-require "util.datamanager"
-
-local datamanager = datamanager;
+local datamanager = require "util.datamanager"
 local st = require "util.stanza";
 
 module "rostermanager"
@@ -49,7 +54,7 @@ function remove_from_roster(session, jid)
 end
 
 function roster_push(username, host, jid)
-       if hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster then
+       if jid ~= "pending" and hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster then
                local item = hosts[host].sessions[username].roster[jid];
                local stanza = st.iq({type="set"});
                stanza:tag("query", {xmlns = "jabber:iq:roster"});
@@ -61,8 +66,8 @@ function roster_push(username, host, jid)
                else
                        stanza:tag("item", {jid = jid, subscription = "remove"});
                end
-               stanza:up();
-               stanza:up();
+               stanza:up(); -- move out from item
+               stanza:up(); -- move out from stanza
                -- stanza ready
                for _, session in pairs(hosts[host].sessions[username].sessions) do
                        if session.interested then
@@ -74,19 +79,23 @@ function roster_push(username, host, jid)
 end
 
 function load_roster(username, host)
+       log("debug", "load_roster: asked for: "..username.."@"..host);
        if hosts[host] and hosts[host].sessions[username] then
                local 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 {};
                        hosts[host].sessions[username].roster = roster;
                end
                return roster;
        end
        -- Attempt to load roster for non-loaded user
+       log("debug", "load_roster: loading for offline user: "..username.."@"..host);
        return datamanager.load(username, host, "roster") or {};
 end
 
 function save_roster(username, host)
+       log("debug", "save_roster: saving roster for "..username.."@"..host);
        if hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster then
                return datamanager.store(username, host, "roster", hosts[host].sessions[username].roster);
        end
@@ -159,7 +168,7 @@ end
 
 function is_contact_pending_in(username, host, jid)
        local roster = load_roster(username, host);
-       return roster.pending or roster.pending[jid];
+       return roster.pending and roster.pending[jid];
 end
 function set_contact_pending_in(username, host, jid, pending)
        local roster = load_roster(username, host);
@@ -183,10 +192,11 @@ function set_contact_pending_out(username, host, jid) -- subscribe
                return true;
        end
        if not item then
-               item = {subscription = "none"};
+               item = {subscription = "none", groups = {}};
                roster[jid] = item;
        end
        item.ask = "subscribe";
+       log("debug", "set_contact_pending_out: saving roster; set "..username.."@"..host..".roster["..jid.."].ask=subscribe");
        return datamanager.store(username, host, "roster", roster);
 end
 function unsubscribe(username, host, jid)
@@ -211,7 +221,7 @@ function subscribed(username, host, jid)
                if item.subscription == "none" then
                        item.subscription = "from";
                else -- subscription == to
-                       item.subsctiption = "both";
+                       item.subscription = "both";
                end
                roster.pending[jid] = nil;
                -- TODO maybe remove roster.pending if empty
@@ -231,7 +241,7 @@ function unsubscribed(username, host, jid)
                if item.subscription == "from" then
                        item.subscription = "none";
                        changed = true;
-               elseif item.subscription == both then
+               elseif item.subscription == "both" then
                        item.subscription = "to";
                        changed = true;
                end