From 71ab938d534d425b388ab0d76204b3a232bcadce Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 15 Jul 2013 11:43:23 +0100 Subject: rostermanager, mod_groups: Change roster-load event to pass an event table for consistency --- core/rostermanager.lua | 2 +- plugins/mod_groups.lua | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/rostermanager.lua b/core/rostermanager.lua index 5e06e3f7..4c669eac 100644 --- 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 f7f632c2..dc6976d4 100644 --- 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 -- cgit v1.2.3