mod_storage_sql2: Do an early return and drop an indentation level

[prosody.git] / plugins / mod_groups.lua

diff --git a/plugins/mod_groups.lua b/plugins/mod_groups.lua
index 90c18fa1c0514c0bc224220b03eca0dac9999311..dc6976d4febdce5de2cea24e1270b54b3792d40e 100644 (file)
--- a/plugins/mod_groups.lua
+++ b/plugins/mod_groups.lua
@@ -13,15 +13,17 @@ local members;
 local groups_file;
 
 local jid, datamanager = require "util.jid", require "util.datamanager";
-local jid_bare, jid_prep = jid.bare, jid.prep;
+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
@@ -34,9 +36,9 @@ function inject_roster_contacts(username, host, roster)
                                end
                                if not roster[jid].groups then
                                        roster[jid].groups = { [group_name] = true };
-                                       roster[jid].persist = false;
                                end
                                roster[jid].groups[group_name] = true;
+                               roster[jid].persist = false;
                        end
                end
        end
@@ -80,7 +82,7 @@ function remove_virtual_contacts(username, host, datastore, data)
 end
 
 function module.load()
-       groups_file = config.get(module:get_host(), "core", "groups_file");
+       groups_file = module:get_option_string("groups_file");
        if not groups_file then return; end
        
        module:hook("roster-load", inject_roster_contacts);
@@ -121,3 +123,8 @@ end
 function module.unload()
        datamanager.remove_callback(remove_virtual_contacts);
 end
+
+-- Public for other modules to access
+function group_contains(group_name, jid)
+       return groups[group_name][jid];
+end