usermanager: Changed function is_admin to allow checking for host-specific admins.

[prosody.git] / core / rostermanager.lua

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 867add2c1889b4b268f899f9f7c4fd93d473a590..ddff841e9e3b5571e03137ce5adf5e120a63eb5a 100644 (file)
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -82,27 +82,39 @@ end
 
 function load_roster(username, host)
        log("debug", "load_roster: asked for: "..username.."@"..host);
+       local roster;
        if hosts[host] and hosts[host].sessions[username] then
-               local roster = hosts[host].sessions[username].roster;
+               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
                        hosts[host].sessions[username].roster = roster;
+                       hosts[host].events.fire_event("roster-load", username, host, 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 {};
+       roster = datamanager.load(username, host, "roster") or {};
+       hosts[host].events.fire_event("roster-load", username, host, roster);
+       return roster;
 end
 
-function save_roster(username, host)
+function save_roster(username, host, roster)
        log("debug", "save_roster: saving roster for "..username.."@"..host);
-       if hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster then
-               local roster = hosts[host].sessions[username].roster;
-               roster[false].version = (roster[false].version or 1) + 1;
-               return datamanager.store(username, host, "roster", hosts[host].sessions[username].roster);
+       if not roster then
+               roster = hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster;
+               --if not roster then
+               --      --roster = load_roster(username, host);
+               --      return true; -- roster unchanged, no reason to save
+               --end
+       end
+       if roster then
+               if not roster[false] then roster[false] = {}; end
+               roster[false].version = (roster[false].version or 0) + 1;
+               return datamanager.store(username, host, "roster", roster);
        end
        log("warn", "save_roster: user had no roster to save");
        return nil;
@@ -118,7 +130,7 @@ function process_inbound_subscription_approval(username, host, jid)
                        item.subscription = "both";
                end
                item.ask = nil;
-               return datamanager.store(username, host, "roster", roster);
+               return save_roster(username, host, roster);
        end
 end
 
@@ -140,7 +152,7 @@ function process_inbound_subscription_cancellation(username, host, jid)
                end
        end
        if changed then
-               return datamanager.store(username, host, "roster", roster);
+               return save_roster(username, host, roster);
        end
 end
 
@@ -162,7 +174,7 @@ function process_inbound_unsubscribe(username, host, jid)
                end
        end
        if changed then
-               return datamanager.store(username, host, "roster", roster);
+               return save_roster(username, host, roster);
        end
 end
 
@@ -184,7 +196,7 @@ function set_contact_pending_in(username, host, jid, pending)
        end
        if not roster.pending then roster.pending = {}; end
        roster.pending[jid] = true;
-       return datamanager.store(username, host, "roster", roster);
+       return save_roster(username, host, roster);
 end
 function is_contact_pending_out(username, host, jid)
        local roster = load_roster(username, host);
@@ -203,7 +215,7 @@ function set_contact_pending_out(username, host, jid) -- subscribe
        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);
+       return save_roster(username, host, roster);
 end
 function unsubscribe(username, host, jid)
        local roster = load_roster(username, host);
@@ -218,7 +230,7 @@ function unsubscribe(username, host, jid)
        elseif item.subscription == "to" then
                item.subscription = "none";
        end
-       return datamanager.store(username, host, "roster", roster);
+       return save_roster(username, host, roster);
 end
 function subscribed(username, host, jid)
        if is_contact_pending_in(username, host, jid) then
@@ -235,7 +247,7 @@ function subscribed(username, host, jid)
                end
                roster.pending[jid] = nil;
                -- TODO maybe remove roster.pending if empty
-               return datamanager.store(username, host, "roster", roster);
+               return save_roster(username, host, roster);
        end -- TODO else implement optional feature pre-approval (ask = subscribed)
 end
 function unsubscribed(username, host, jid)
@@ -257,7 +269,7 @@ function unsubscribed(username, host, jid)
                end
        end
        if changed then
-               return datamanager.store(username, host, "roster", roster);
+               return save_roster(username, host, roster);
        end
 end
 
@@ -266,7 +278,7 @@ function process_outbound_subscription_request(username, host, jid)
        local item = roster[jid];
        if item and (item.subscription == "none" or item.subscription == "from") then
                item.ask = "subscribe";
-               return datamanager.store(username, host, "roster", roster);
+               return save_roster(username, host, roster);
        end
 end
 
@@ -275,7 +287,7 @@ end
        local item = roster[jid];
        if item and (item.subscription == "none" or item.subscription == "from" then
                item.ask = "subscribe";
-               return datamanager.store(username, host, "roster", roster);
+               return save_roster(username, host, roster);
        end
 end]]