X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Frostermanager.lua;h=0163e343a09c5540f9defeda4c607ebb3d7407e1;hb=7b9f5dde4cdb0661198660080428e862df55bc01;hp=a08f989dbd81633c7a25ef04499f94b2ba3c8ca7;hpb=440f2f345215d00462a4d43685cc4ae30d4ec828;p=prosody.git

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index a08f989d..0163e343 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -1,3 +1,12 @@
+-- Prosody IM
+-- 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 log = require "util.logger".init("rostermanager");
@@ -6,6 +15,7 @@ local setmetatable = setmetatable;
 local format = string.format;
 local loadfile, setfenv, pcall = loadfile, setfenv, pcall;
 local pairs, ipairs = pairs, ipairs;
+local tostring = tostring;
 
 local hosts = hosts;
 
@@ -45,10 +55,11 @@ function remove_from_roster(session, jid)
 end
 
 function roster_push(username, host, jid)
-	if jid ~= "pending" and hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster then
+	local roster = jid and jid ~= "pending" and hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster;
+	if roster then
 		local item = hosts[host].sessions[username].roster[jid];
 		local stanza = st.iq({type="set"});
-		stanza:tag("query", {xmlns = "jabber:iq:roster"});
+		stanza:tag("query", {xmlns = "jabber:iq:roster", ver = tostring(roster[false].version or "1")  });
 		if item then
 			stanza:tag("item", {jid = jid, subscription = item.subscription, name = item.name, ask = item.ask});
 			for group in pairs(item.groups) do
@@ -71,25 +82,34 @@ 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)
 	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);
 	end
+	log("warn", "save_roster: user had no roster to save");
 	return nil;
 end
 
@@ -209,6 +229,10 @@ function subscribed(username, host, jid)
 	if is_contact_pending_in(username, host, jid) then
 		local roster = load_roster(username, host);
 		local item = roster[jid];
+		if not item then -- FIXME should roster item be auto-created?
+			item = {subscription = "none", groups = {}};
+			roster[jid] = item;
+		end
 		if item.subscription == "none" then
 			item.subscription = "from";
 		else -- subscription == to
@@ -262,4 +286,4 @@ end]]
 
 
 
-return _M;
\ No newline at end of file
+return _M;