projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.9->trunk
[prosody.git]
/
plugins
/
mod_groups.lua
diff --git
a/plugins/mod_groups.lua
b/plugins/mod_groups.lua
index 5f821cbc28e768f65c3794c66e3d61c51d42f476..199925f9c2da711ab7760447e489f3befc8ba362 100644
(file)
--- a/
plugins/mod_groups.lua
+++ b/
plugins/mod_groups.lua
@@
-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 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
if not roster[jid].groups then
roster[jid].groups = { [group_name] = true };
end
@@
-77,7
+80,7
@@
function remove_virtual_contacts(username, host, datastore, data)
end
function module.load()
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);
if not groups_file then return; end
module:hook("roster-load", inject_roster_contacts);
@@
-100,10
+103,13
@@
function module.load()
groups[curr_group] = groups[curr_group] or {};
else
-- Add JID
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));
if jid then
module:log("debug", "New member of %s: %s", tostring(curr_group), tostring(jid));
- groups[curr_group][jid] =
tru
e;
+ groups[curr_group][jid] =
name or fals
e;
members[jid] = members[jid] or {};
members[jid][#members[jid]+1] = curr_group;
end
members[jid] = members[jid] or {};
members[jid][#members[jid]+1] = curr_group;
end