X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Frostermanager.lua;h=506cf20593aa7da447d09ca5836517bbda1bab3b;hb=1881612f6e77c771984d73b85704e89818a82977;hp=fc8a586299393c4e0f0de0a05f1d7ed0d6afc210;hpb=8aba1c77f0714f2460cc21660bb494fc217e042b;p=prosody.git diff --git a/core/rostermanager.lua b/core/rostermanager.lua index fc8a5862..506cf205 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -1,20 +1,9 @@ --- Prosody IM v0.2 --- Copyright (C) 2008 Matthew Wild --- Copyright (C) 2008 Waqas Hussain +-- Prosody IM +-- Copyright (C) 2008-2010 Matthew Wild +-- Copyright (C) 2008-2010 Waqas Hussain -- --- This program is free software; you can redistribute it and/or --- modify it under the terms of the GNU General Public License --- as published by the Free Software Foundation; either version 2 --- of the License, or (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-- This project is MIT/X11 licensed. Please see the +-- COPYING file in the source package for more information. -- @@ -26,8 +15,10 @@ 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; +local bare_sessions = bare_sessions; local datamanager = require "util.datamanager" local st = require "util.stanza"; @@ -65,10 +56,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 @@ -90,26 +82,53 @@ 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; + local jid = username.."@"..host; + log("debug", "load_roster: asked for: "..jid); + local user = bare_sessions[jid]; + local roster; + if user then + roster = user.roster; + if roster then return roster; end + log("debug", "load_roster: loading for new user: "..username.."@"..host); + else -- Attempt to load roster for non-loaded user + log("debug", "load_roster: loading for offline user: "..username.."@"..host); + end + local data, err = datamanager.load(username, host, "roster"); + roster = data or {}; + if user then user.roster = roster; end + if not roster[false] then roster[false] = { broken = err or nil }; end + if roster[jid] then + roster[jid] = nil; + log("warn", "roster for "..jid.." has a self-contact"); + end + if not err then + hosts[host].events.fire_event("roster-load", username, host, 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 {}; + return roster, err; 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 - 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 + local metadata = roster[false]; + if not metadata then + metadata = {}; + roster[false] = metadata; + end + if metadata.version ~= true then + metadata.version = (metadata.version or 0) + 1; + end + if roster[false].broken then return nil, "Not saving broken roster" end + return datamanager.store(username, host, "roster", roster); end + log("warn", "save_roster: user had no roster to save"); return nil; end @@ -123,7 +142,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 @@ -145,7 +164,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 @@ -167,14 +186,14 @@ 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 function is_contact_subscribed(username, host, jid) - local roster = load_roster(username, host); + local roster, err = load_roster(username, host); local item = roster[jid]; - return item and (item.subscription == "from" or item.subscription == "both"); + return item and (item.subscription == "from" or item.subscription == "both"), err; end function is_contact_pending_in(username, host, jid) @@ -189,7 +208,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); @@ -208,7 +227,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); @@ -223,12 +242,16 @@ 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 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 @@ -236,7 +259,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) @@ -258,7 +281,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 @@ -267,7 +290,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 @@ -276,10 +299,10 @@ 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]] -return _M; \ No newline at end of file +return _M;