rostermanager, mod_groups: Change roster-load event to pass an event table for consis...

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 5e06e3f7a4203ec5c82971f638f4b81322c9e74a..4c669eac38d26e60eee49a77e5a0809460faf92d 100644 (file)
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -100,7 +100,7 @@ function load_roster(username, host)
                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);
+               hosts[host].events.fire_event("roster-load", { username = username, host = host, roster = roster });
        end
        return roster, err;
 end

diff --git a/plugins/mod_groups.lua b/plugins/mod_groups.lua
index f7f632c230564697a68ac314621ed10aa33c737a..dc6976d4febdce5de2cea24e1270b54b3792d40e 100644 (file)
--- a/plugins/mod_groups.lua
+++ b/plugins/mod_groups.lua
@@ -17,11 +17,13 @@ local jid_prep = jid.prep;
 
 local module_host = module:get_host();
 
-function inject_roster_contacts(username, host, roster)
+function inject_roster_contacts(event)
+       local username, host= event.username, event.host;
        --module:log("debug", "Injecting group members to roster");
        local bare_jid = username.."@"..host;
        if not members[bare_jid] and not members[false] then return; end -- Not a member of any groups
        
+       local roster = event.roster;
        local function import_jids_to_roster(group_name)
                for jid in pairs(groups[group_name]) do
                        -- Add them to roster