From 94a868c6a57a25282b154912166047642c4a7a9c 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 --- plugins/mod_groups.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'plugins/mod_groups.lua') 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 From 4b618a8727365b880e115c6fd53869040c2ad238 Mon Sep 17 00:00:00 2001 From: Florian Zeitz Date: Fri, 9 Aug 2013 17:48:21 +0200 Subject: Remove all trailing whitespace --- plugins/mod_groups.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/mod_groups.lua') diff --git a/plugins/mod_groups.lua b/plugins/mod_groups.lua index dc6976d4..be1a5508 100644 --- a/plugins/mod_groups.lua +++ b/plugins/mod_groups.lua @@ -1,7 +1,7 @@ -- Prosody IM -- Copyright (C) 2008-2010 Matthew Wild -- Copyright (C) 2008-2010 Waqas Hussain --- +-- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- @@ -22,7 +22,7 @@ function inject_roster_contacts(event) --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 @@ -50,7 +50,7 @@ function inject_roster_contacts(event) import_jids_to_roster(group_name); end end - + -- Import public groups if members[false] then for _, group_name in ipairs(members[false]) do @@ -58,7 +58,7 @@ function inject_roster_contacts(event) import_jids_to_roster(group_name); end end - + if roster[false] then roster[false].version = true; end @@ -84,10 +84,10 @@ end function module.load() groups_file = module:get_option_string("groups_file"); if not groups_file then return; end - + module:hook("roster-load", inject_roster_contacts); datamanager.add_callback(remove_virtual_contacts); - + groups = { default = {} }; members = { }; local curr_group = "default"; -- cgit v1.2.3