util.filters: Fix inserting items so that higher priority filters run first

[prosody.git] / core / rostermanager.lua

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 59ba6579a24af27fe78470de5473bb4ff1347698..5e06e3f7a4203ec5c82971f638f4b81322c9e74a 100644 (file)
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -11,16 +11,14 @@
 
 local log = require "util.logger".init("rostermanager");
 
-local setmetatable = setmetatable;
-local format = string.format;
-local loadfile, setfenv, pcall = loadfile, setfenv, pcall;
-local pairs, ipairs = pairs, ipairs;
+local pairs = pairs;
 local tostring = tostring;
 
 local hosts = hosts;
 local bare_sessions = bare_sessions;
 
 local datamanager = require "util.datamanager"
+local um_user_exists = require "core.usermanager".user_exists;
 local st = require "util.stanza";
 
 module "rostermanager"
@@ -83,15 +81,15 @@ end
 
 function load_roster(username, host)
        local jid = username.."@"..host;
-       log("debug", "load_roster: asked for: "..jid);
+       log("debug", "load_roster: asked for: %s", 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);
+               log("debug", "load_roster: loading for new user: %s@%s", username, host);
        else -- Attempt to load roster for non-loaded user
-               log("debug", "load_roster: loading for offline user: "..username.."@"..host);
+               log("debug", "load_roster: loading for offline user: %s@%s", username, host);
        end
        local data, err = datamanager.load(username, host, "roster");
        roster = data or {};
@@ -99,7 +97,7 @@ function load_roster(username, host)
        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");
+               log("warn", "roster for %s has a self-contact", jid);
        end
        if not err then
                hosts[host].events.fire_event("roster-load", username, host, roster);
@@ -108,7 +106,12 @@ function load_roster(username, host)
 end
 
 function save_roster(username, host, roster)
-       log("debug", "save_roster: saving roster for "..username.."@"..host);
+       if not um_user_exists(username, host) then
+               log("debug", "not saving roster for %s@%s: the user doesn't exist", username, host);
+               return nil;
+       end
+
+       log("debug", "save_roster: saving roster for %s@%s", username, host);
        if not roster then
                roster = hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster;
                --if not roster then
@@ -238,7 +241,7 @@ function set_contact_pending_out(username, host, jid) -- subscribe
                roster[jid] = item;
        end
        item.ask = "subscribe";
-       log("debug", "set_contact_pending_out: saving roster; set "..username.."@"..host..".roster["..jid.."].ask=subscribe");
+       log("debug", "set_contact_pending_out: saving roster; set %s@%s.roster[%q].ask=subscribe", username, host, jid);
        return save_roster(username, host, roster);
 end
 function unsubscribe(username, host, jid)
@@ -278,23 +281,21 @@ 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
+       if pending then
                roster.pending[jid] = nil; -- TODO maybe delete roster.pending if empty?
-               changed = true;
        end
+       local subscribed;
        if item then
                if item.subscription == "from" then
                        item.subscription = "none";
-                       changed = true;
+                       subscribed = true;
                elseif item.subscription == "both" then
                        item.subscription = "to";
-                       changed = true;
+                       subscribed = true;
                end
        end
-       if changed then
-               return save_roster(username, host, roster);
-       end
+       local success = (pending or subscribed) and save_roster(username, host, roster);
+       return success, pending, subscribed;
 end
 
 function process_outbound_subscription_request(username, host, jid)