From 17d7c83a7141e6d2142c9dece0845051c85ef592 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 25 Oct 2008 02:16:29 +0500 Subject: Inbound subscription approval --- core/rostermanager.lua | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'core/rostermanager.lua') diff --git a/core/rostermanager.lua b/core/rostermanager.lua index c39d28ed..a9be62aa 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -83,7 +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 + return datamanager.load(username, host, "roster") or {}; end function save_roster(username, host) @@ -93,4 +93,18 @@ function save_roster(username, host) return nil; end +function process_inbound_subscription_approval(username, host, jid) + local roster = load_roster(username, host); + local item = roster[jid]; + if item and item.ask and (item.subscription == "none" or item.subscription == "from") then + if item.subscription == "none" then + item.subscription = "to"; + else + item.subscription = "both"; + end + item.ask = nil; + return datamanager.store(username, host, "roster", roster); + end +end + return _M; \ No newline at end of file -- cgit v1.2.3 From 6c822abf42a548865e7907f1f02c8e3344580b4d Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 25 Oct 2008 02:29:58 +0500 Subject: Inbound subscription cancellation --- core/rostermanager.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'core/rostermanager.lua') diff --git a/core/rostermanager.lua b/core/rostermanager.lua index a9be62aa..3cdbbd3a 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -107,4 +107,18 @@ function process_inbound_subscription_approval(username, host, jid) end end +function process_inbound_subscription_cancellation(username, host, jid) + local roster = load_roster(username, host); + local item = roster[jid]; + if item and (item.subscription == "to" or item.subscription == "both") then + if item.subscription == "to" then + item.subscription = "none"; + else + item.subscription = "from"; + end + -- FIXME do we need to item.ask = nil;? + return datamanager.store(username, host, "roster", roster); + end +end + return _M; \ No newline at end of file -- cgit v1.2.3 From 2ab824859d622653d405e8ea0515e3acca9180f4 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 25 Oct 2008 02:38:24 +0500 Subject: Inbound unsubscribe --- core/rostermanager.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'core/rostermanager.lua') diff --git a/core/rostermanager.lua b/core/rostermanager.lua index 3cdbbd3a..83bb379e 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -121,4 +121,18 @@ function process_inbound_subscription_cancellation(username, host, jid) end end +function process_inbound_unsubscribe(username, host, jid) + local roster = load_roster(username, host); + local item = roster[jid]; + if item and (item.subscription == "from" or item.subscription == "both") then + if item.subscription == "from" then + item.subscription = "none"; + else + item.subscription = "to"; + end + item.ask = nil; + return datamanager.store(username, host, "roster", roster); + end +end + return _M; \ No newline at end of file -- cgit v1.2.3 From 9bd8c81c916f22ffb11ce4f11f74edc87002fbb2 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 25 Oct 2008 03:13:10 +0500 Subject: Inbound subscription request --- core/rostermanager.lua | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'core/rostermanager.lua') diff --git a/core/rostermanager.lua b/core/rostermanager.lua index 83bb379e..7d7fd061 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -135,4 +135,10 @@ function process_inbound_unsubscribe(username, host, jid) end end +function is_contact_subscribed(username, host, jid) + local roster = load_roster(username, host); + local item = roster[jid]; + return item and (item.subscription == "from" or item.subscription == "both"); +end + return _M; \ No newline at end of file -- cgit v1.2.3 From 091e961c40b6d89f548efecea07e641e3f9c4210 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 25 Oct 2008 21:16:08 +0500 Subject: Outbound presence subscription --- core/rostermanager.lua | 136 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 128 insertions(+), 8 deletions(-) (limited to 'core/rostermanager.lua') diff --git a/core/rostermanager.lua b/core/rostermanager.lua index 7d7fd061..ffc4f481 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -96,10 +96,10 @@ end function process_inbound_subscription_approval(username, host, jid) local roster = load_roster(username, host); local item = roster[jid]; - if item and item.ask and (item.subscription == "none" or item.subscription == "from") then + if item and item.ask then if item.subscription == "none" then item.subscription = "to"; - else + else -- subscription == from item.subscription = "both"; end item.ask = nil; @@ -110,13 +110,21 @@ end function process_inbound_subscription_cancellation(username, host, jid) local roster = load_roster(username, host); local item = roster[jid]; - if item and (item.subscription == "to" or item.subscription == "both") then + local changed = nil; + if is_contact_pending_out(username, host, jid) then + item.ask = nil; + changed = true; + end + if item then if item.subscription == "to" then item.subscription = "none"; - else + changed = true; + elseif item.subscription == "both" then item.subscription = "from"; + changed = true; end - -- FIXME do we need to item.ask = nil;? + end + if changed then return datamanager.store(username, host, "roster", roster); end end @@ -124,13 +132,21 @@ end function process_inbound_unsubscribe(username, host, jid) local roster = load_roster(username, host); local item = roster[jid]; - if item and (item.subscription == "from" or item.subscription == "both") then + local changed = nil; + if is_contact_pending_in(username, host, jid) then + roster.pending[jid] = nil; -- TODO maybe delete roster.pending if empty? + changed = true; + end + if item then if item.subscription == "from" then item.subscription = "none"; - else + changed = true; + elseif item.subscription == "both" then item.subscription = "to"; + changed = true; end - item.ask = nil; + end + if changed then return datamanager.store(username, host, "roster", roster); end end @@ -141,4 +157,108 @@ function is_contact_subscribed(username, host, jid) return item and (item.subscription == "from" or item.subscription == "both"); end +function is_contact_pending_in(username, host, jid) + local roster = load_roster(username, host); + return roster.pending or roster.pending[jid]; +end +function set_contact_pending_in(username, host, jid, pending) + local roster = load_roster(username, host); + local item = roster[jid]; + if item and (item.subscription == "from" or item.subscription == "both") then + return; -- false + end + if not roster.pending then roster.pending = {}; end + roster.pending[jid] = true; + return datamanager.store(username, host, "roster", roster); +end +function is_contact_pending_out(username, host, jid) + local roster = load_roster(username, host); + local item = roster[jid]; + return item and item.ask; +end +function set_contact_pending_out(username, host, jid) -- subscribe + local roster = load_roster(username, host); + local item = roster[jid]; + if item and (item.ask or item.subscription == "to" or item.subscription == "both") then + return true; + end + if not item then + item = {subscription = "none"}; + roster[jid] = item; + end + item.ask = "subscribe"; + return datamanager.store(username, host, "roster", roster); +end +function unsubscribe(username, host, jid) + local roster = load_roster(username, host); + local item = roster[jid]; + if not item then return false; end + if (item.subscription == "from" or item.subscription == "none") and not item.ask then + return true; + end + item.ask = nil; + if item.subscription == "both" then + item.subscription = "from"; + elseif item.subscription == "to" then + item.subscription = "none"; + end + return datamanager.store(username, host, "roster", roster); +end +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 item.subscription == "none" then + item.subscription = "from"; + else -- subscription == to + item.subsctiption = "both"; + end + roster.pending[jid] = nil; + -- TODO maybe remove roster.pending if empty + return datamanager.store(username, host, "roster", roster); + end -- TODO else implement optional feature pre-approval (ask = subscribed) +end +function unsubscribed(username, host, jid) + local roster = load_roster(username, host); + local item = roster[jid]; + local pending = is_contact_pending_in(username, host, jid); + local changed = nil; + if is_contact_pending_in(username, host, jid) then + roster.pending[jid] = nil; -- TODO maybe delete roster.pending if empty? + changed = true; + end + if item then + if item.subscription == "from" then + item.subscription = "none"; + changed = true; + elseif item.subscription == both then + item.subscription = "to"; + changed = true; + end + end + if changed then + return datamanager.store(username, host, "roster", roster); + end +end + +function process_outbound_subscription_request(username, host, jid) + local roster = load_roster(username, host); + 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); + end +end + +--[[function process_outbound_subscription_approval(username, host, jid) + local roster = load_roster(username, host); + 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); + end +end]] + + + return _M; \ No newline at end of file -- cgit v1.2.3 From 1746f7eea0135b89a4f871d11c71cded04c4c0c3 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 26 Oct 2008 00:22:18 +0500 Subject: Bug fixes and checks for presence subscriptions, etc --- core/rostermanager.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'core/rostermanager.lua') diff --git a/core/rostermanager.lua b/core/rostermanager.lua index ffc4f481..7d8d4ee1 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -49,7 +49,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"}); @@ -74,19 +74,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 +163,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 +187,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 +216,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 -- cgit v1.2.3