From: Waqas Hussain <waqas20@gmail.com>
Date: Thu, 23 Oct 2008 15:02:30 +0000 (+0500)
Subject: Roster updates
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=09fd674533ad8d00887cfce0718c7eb95997a8bd;p=prosody.git

Roster updates
 - Added support for item.ask attribute in rostermanager and mod_roster
 - Updated roster docs
 - Removed old code from rostermanager
---

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 26a14256..c39d28ed 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -18,17 +18,6 @@ local st = require "util.stanza";
 
 module "rostermanager"
 
---[[function getroster(username, host)
-	return { 
-			["mattj@localhost"] = true,
-			["tobias@getjabber.ath.cx"] = true,
-			["waqas@getjabber.ath.cx"] = true,
-			["thorns@getjabber.ath.cx"] = true, 
-			["idw@getjabber.ath.cx"] = true, 
-		}
-	--return datamanager.load(username, host, "roster") or {};
-end]]
-
 function add_to_roster(session, jid, item)
 	if session.roster then
 		local old_item = session.roster[jid];
@@ -65,7 +54,7 @@ function roster_push(username, host, jid)
 		local stanza = st.iq({type="set"});
 		stanza:tag("query", {xmlns = "jabber:iq:roster"});
 		if item then
-			stanza:tag("item", {jid = jid, subscription = item.subscription, name = item.name});
+			stanza:tag("item", {jid = jid, subscription = item.subscription, name = item.name, ask = item.ask});
 			for group in pairs(item.groups) do
 				stanza:tag("group"):text(group):up();
 			end
@@ -94,6 +83,7 @@ function load_roster(username, host)
 		return roster;
 	end
 	-- Attempt to load roster for non-loaded user
+	-- TODO also support loading for offline user
 end
 
 function save_roster(username, host)
diff --git a/doc/roster_format.txt b/doc/roster_format.txt
index 73186c2b..132dbf4e 100644
--- a/doc/roster_format.txt
+++ b/doc/roster_format.txt
@@ -9,7 +9,7 @@ table roster_item {
   string subscription = "none" | "to" | "from" | "both"
   string name = Opaque string set by client. (optional)
   set groups = a set of opaque strings set by the client
-  boolean ask = nil | true - a value of true indicates subscription is pending
+  boolean ask = nil | "subscribe" - a value of true indicates subscription is pending
 }
 
 The roster is available as
diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 8a20f76d..d02f77a5 100644
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -19,6 +19,7 @@ add_iq_handler("c2s", "jabber:iq:roster",
 						roster:tag("item", {
 							jid = jid,
 							subscription = session.roster[jid].subscription,
+							ask = session.roster[jid].ask,
 							name = session.roster[jid].name,
 						});
 						for group in pairs(session.roster[jid].groups) do
@@ -54,6 +55,7 @@ add_iq_handler("c2s", "jabber:iq:roster",
 									if r_item.name == "" then r_item.name = nil; end
 									if session.roster[item.attr.jid] then
 										r_item.subscription = session.roster[item.attr.jid].subscription;
+										r_item.ask = session.roster[item.attr.jid].ask;
 									else
 										r_item.subscription = "none";
 									end