Merge Tobias SCRAM-PLUS work

[prosody.git] / plugins / mod_groups.lua

diff --git a/plugins/mod_groups.lua b/plugins/mod_groups.lua
index de7b8302267dc52f90a63c139eb8fc6fb2cff2bb..be1a5508f87021d24a1c8d064060ba667f711f38 100644 (file)
--- 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.
 --
@@ -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
@@ -29,6 +31,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
@@ -45,7 +50,7 @@ function inject_roster_contacts(username, host, roster)
                        import_jids_to_roster(group_name);
                end
        end
-       
+
        -- Import public groups
        if members[false] then
                for _, group_name in ipairs(members[false]) do
@@ -53,7 +58,7 @@ function inject_roster_contacts(username, host, roster)
                        import_jids_to_roster(group_name);
                end
        end
-       
+
        if roster[false] then
                roster[false].version = true;
        end
@@ -67,7 +72,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,12 +82,12 @@ 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);
        datamanager.add_callback(remove_virtual_contacts);
-       
+
        groups = { default = {} };
        members = { };
        local curr_group = "default";
@@ -98,10 +105,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 +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