# HG changeset patch # User Matthew Wild # Date 1373885003 -3600 # Node ID 23076ee191d3fafedd357a13ffe0fcf2aea3a669 # Parent 3137751751b4b63b050c796e218f15ec163f816e rostermanager, mod_groups: Change roster-load event to pass an event table for consistency diff -r 3137751751b4 -r 23076ee191d3 core/rostermanager.lua --- a/core/rostermanager.lua Sat Jul 13 13:17:53 2013 +0100 +++ b/core/rostermanager.lua Mon Jul 15 11:43:23 2013 +0100 @@ -100,7 +100,7 @@ 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 -r 3137751751b4 -r 23076ee191d3 plugins/mod_groups.lua --- a/plugins/mod_groups.lua Sat Jul 13 13:17:53 2013 +0100 +++ b/plugins/mod_groups.lua Mon Jul 15 11:43:23 2013 +0100 @@ -17,11 +17,13 @@ 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