aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-04-03 06:39:28 +0200
committerKim Alvefur <zash@zash.se>2015-04-03 06:39:28 +0200
commit12d6e03b5b62d8974f98492112a70fc754b5cb28 (patch)
tree0ddb52bfa4a521df1e6ef7b9f54e3e3d615597a2 /core
parent315e3b3b937c22224c4530a194420f1b2fd77316 (diff)
parent28c58565ace33870970010c9d195c5da5d9cf4d1 (diff)
downloadprosody-12d6e03b5b62d8974f98492112a70fc754b5cb28.tar.gz
prosody-12d6e03b5b62d8974f98492112a70fc754b5cb28.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
-rw-r--r--core/rostermanager.lua40
1 files changed, 25 insertions, 15 deletions
diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 8c7612b4..19d07c94 100644
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -54,7 +54,7 @@ function remove_from_roster(session, jid)
end
function roster_push(username, host, jid)
- local roster = jid and jid ~= "pending" and hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster;
+ local roster = jid 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"});
@@ -79,6 +79,22 @@ function roster_push(username, host, jid)
end
end
+local function roster_metadata(roster, err)
+ local metadata = roster[false];
+ if not metadata then
+ metadata = { broken = err or nil };
+ roster[false] = metadata;
+ end
+ if not metadata.pending then
+ if roster.pending and not type(roster.pending.subscription) == "string" then
+ metadata.pending, roster.pending = roster.pending, nil;
+ else
+ metadata.pending = {};
+ end
+ end
+ return metadata;
+end
+
function load_roster(username, host)
local jid = username.."@"..host;
log("debug", "load_roster: asked for: %s", jid);
@@ -94,7 +110,7 @@ function load_roster(username, host)
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
+ roster_metadata(roster, err);
if roster[jid] then
roster[jid] = nil;
log("warn", "roster for %s has a self-contact", jid);
@@ -120,15 +136,11 @@ function save_roster(username, host, roster)
--end
end
if roster then
- local metadata = roster[false];
- if not metadata then
- metadata = {};
- roster[false] = metadata;
- end
+ local metadata = roster_metadata(roster);
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
+ if metadata.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");
@@ -176,7 +188,7 @@ function process_inbound_unsubscribe(username, host, jid)
local item = roster[jid];
local changed = nil;
if is_contact_pending_in(username, host, jid) then
- roster.pending[jid] = nil; -- TODO maybe delete roster.pending if empty?
+ roster[false].pending[jid] = nil;
changed = true;
end
if item then
@@ -213,7 +225,7 @@ end
function is_contact_pending_in(username, host, jid)
local roster = load_roster(username, host);
- return roster.pending and roster.pending[jid];
+ return roster[false].pending[jid];
end
function set_contact_pending_in(username, host, jid, pending)
local roster = load_roster(username, host);
@@ -221,8 +233,7 @@ function set_contact_pending_in(username, host, jid, pending)
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;
+ roster[false].pending[jid] = true;
return save_roster(username, host, roster);
end
function is_contact_pending_out(username, host, jid)
@@ -272,8 +283,7 @@ function subscribed(username, host, jid)
else -- subscription == to
item.subscription = "both";
end
- roster.pending[jid] = nil;
- -- TODO maybe remove roster.pending if empty
+ roster[false].pending[jid] = nil;
return save_roster(username, host, roster);
end -- TODO else implement optional feature pre-approval (ask = subscribed)
end
@@ -282,7 +292,7 @@ function unsubscribed(username, host, jid)
local item = roster[jid];
local pending = is_contact_pending_in(username, host, jid);
if pending then
- roster.pending[jid] = nil; -- TODO maybe delete roster.pending if empty?
+ roster[false].pending[jid] = nil;
end
local subscribed;
if item then