test_util_cache: remove unused argument c3 [luacheck]

[prosody.git] / core / rostermanager.lua

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 176eba5b7edbd566593627c40afd10808eed46ff..58d1f16e1c5bf67b8dd8eeeef01940a10ed443cf 100644 (file)
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -20,6 +20,7 @@ local bare_sessions = prosody.bare_sessions;
 
 local um_user_exists = require "core.usermanager".user_exists;
 local st = require "util.stanza";
+local storagemanager = require "core.storagemanager";
 
 local _ENV = nil;
 
@@ -74,7 +75,6 @@ local function roster_push(username, host, jid)
                -- stanza ready
                for _, session in pairs(hosts[host].sessions[username].sessions) do
                        if session.interested then
-                               -- FIXME do we need to set stanza.attr.to?
                                session.send(stanza);
                        end
                end
@@ -108,7 +108,7 @@ local function load_roster(username, host)
        else -- Attempt to load roster for non-loaded user
                log("debug", "load_roster: loading for offline user: %s@%s", username, host);
        end
-       local roster_store = require "core.storagemanager".open(host, "roster", "keyval");
+       local roster_store = storagemanager.open(host, "roster", "keyval");
        local data, err = roster_store:get(username);
        roster = data or {};
        if user then user.roster = roster; end
@@ -144,10 +144,10 @@ function save_roster(username, host, roster, jid)
                end
                if metadata.broken then return nil, "Not saving broken roster" end
                if jid == nil then
-                       local roster_store = require "core.storagemanager".open(host, "roster", "keyval");
+                       local roster_store = storagemanager.open(host, "roster", "keyval");
                        return roster_store:set(username, roster);
                else
-                       local roster_store = require "core.storagemanager".open(host, "roster", "map");
+                       local roster_store = storagemanager.open(host, "roster", "map");
                        return roster_store:set_keys(username, { [false] = metadata, [jid] = roster[jid] or roster_store.remove });
                end
        end