MUC: Always return <service-unavailable/> when a node is present in service discovery...

[prosody.git] / plugins / mod_groups.lua

diff --git a/plugins/mod_groups.lua b/plugins/mod_groups.lua
index 2388653940b05bd49aa73b49138b8640023fa93e..7a876f1d6845a67f4e69f57d4564cdd73e086176 100644 (file)
--- a/plugins/mod_groups.lua
+++ b/plugins/mod_groups.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- 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.
@@ -18,7 +18,7 @@ local jid_bare, jid_prep = jid.bare, 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,10 +52,14 @@ 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
+       
+       if roster[false] then
+               roster[false].version = true;
+       end
 end
 
 function remove_virtual_contacts(username, host, datastore, data)
@@ -63,6 +70,9 @@ function remove_virtual_contacts(username, host, datastore, data)
                                new_roster[jid] = contact;
                        end
                end
+               if new_roster[false] then
+                       new_roster[false].version = nil; -- Version is void
+               end
                return username, host, datastore, new_roster;
        end
 
@@ -77,7 +87,7 @@ function module.load()
        datamanager.add_callback(remove_virtual_contacts);
        
        groups = { default = {} };
-       members = { [false] = {} };
+       members = { };
        local curr_group = "default";
        for line in io.lines(groups_file) do
                if line:match("^%s*%[.-%]%s*$") then
@@ -93,10 +103,13 @@ function module.load()
                        groups[curr_group] = groups[curr_group] or {};
                else
                        -- Add JID
-                       local jid = jid_prep(line);
+                       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