mod_admin_telnet: Add server:memory() command to view details of Prosody's memory...

[prosody.git] / plugins / mod_groups.lua

diff --git a/plugins/mod_groups.lua b/plugins/mod_groups.lua
index d4604b1ec03d0b4f6e6a0b5ba2563de556f48528..f7f632c230564697a68ac314621ed10aa33c737a 100644 (file)
--- a/plugins/mod_groups.lua
+++ b/plugins/mod_groups.lua
@@ -13,12 +13,12 @@ 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)
-       module:log("warn", "Injecting group members to roster");
+       --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
        
@@ -29,6 +29,9 @@ function inject_roster_contacts(username, host, roster)
                        if jid ~= bare_jid then
                                if not roster[jid] then roster[jid] = {}; end
                                roster[jid].subscription = "both";
+                               if groups[group_name][jid] then
+                                       roster[jid].name = groups[group_name][jid];
+                               end
                                if not roster[jid].groups then
                                        roster[jid].groups = { [group_name] = true };
                                end
@@ -41,7 +44,7 @@ function inject_roster_contacts(username, host, roster)
        -- Find groups this JID is a member of
        if members[bare_jid] then
                for _, group_name in ipairs(members[bare_jid]) do
-                       module:log("debug", "Importing group %s", group_name);
+                       --module:log("debug", "Importing group %s", group_name);
                        import_jids_to_roster(group_name);
                end
        end
@@ -49,7 +52,7 @@ function inject_roster_contacts(username, host, roster)
        -- Import public groups
        if members[false] then
                for _, group_name in ipairs(members[false]) do
-                       module:log("debug", "Importing group %s", group_name);
+                       --module:log("debug", "Importing group %s", group_name);
                        import_jids_to_roster(group_name);
                end
        end
@@ -67,7 +70,9 @@ function remove_virtual_contacts(username, host, datastore, data)
                                new_roster[jid] = contact;
                        end
                end
-               new_roster[false].version = nil; -- Version is void
+               if new_roster[false] then
+                       new_roster[false].version = nil; -- Version is void
+               end
                return username, host, datastore, new_roster;
        end
 
@@ -75,7 +80,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);
@@ -98,10 +103,13 @@ function module.load()
                        groups[curr_group] = groups[curr_group] or {};
                else
                        -- Add JID
-                       local jid = jid_prep(line:match("%S+"));
+                       local entryjid, name = line:match("([^=]*)=?(.*)");
+                       module:log("debug", "entryjid = '%s', name = '%s'", entryjid, name);
+                       local jid;
+                       jid = jid_prep(entryjid:match("%S+"));
                        if jid then
                                module:log("debug", "New member of %s: %s", tostring(curr_group), tostring(jid));
-                               groups[curr_group][jid] = true;
+                               groups[curr_group][jid] = name or false;
                                members[jid] = members[jid] or {};
                                members[jid][#members[jid]+1] = curr_group;
                        end
@@ -113,3 +121,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