From 23116a45d4daf902d68e77500a4e600509b2052d Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 22 Jun 2009 14:22:24 +0100 Subject: mod_groups: Experimental shared roster support --- plugins/mod_groups.lua | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 plugins/mod_groups.lua (limited to 'plugins/mod_groups.lua') diff --git a/plugins/mod_groups.lua b/plugins/mod_groups.lua new file mode 100644 index 00000000..8a9e263a --- /dev/null +++ b/plugins/mod_groups.lua @@ -0,0 +1,79 @@ + +local groups = { default = {} }; +local members = {}; + +local groups_file; + +local jid, datamanager = require "util.jid", require "util.datamanager"; +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"); + local bare_jid = username.."@"..host; + if not members[bare_jid] then return; end -- Not a member of any groups + + -- Find groups this JID is a member of + for _, group_name in ipairs(members[bare_jid]) do + -- Find other people in the same group + for jid in pairs(groups[group_name]) do + -- Add them to roster + --module:log("debug", "processing jid %s in group %s", tostring(jid), tostring(group_name)); + if jid ~= bare_jid then + if not roster[jid] then roster[jid] = {}; end + roster[jid].subscription = "both"; + if not roster[jid].groups then + roster[jid].groups = { [group_name] = true }; + end + roster[jid].groups[group_name] = true; + roster[jid].persist = false; + end + end + end +end + +function remove_virtual_contacts(username, host, datastore, data) + if host == module_host and datastore == "roster" then + local new_roster = {}; + for jid, contact in pairs(data) do + if contact.persist ~= false then + new_roster[jid] = contact; + end + end + return username, host, datastore, new_roster; + end + + return username, host, datastore, data; +end + +function module.load() + groups_file = config.get(module:get_host(), "core", "groups_file"); + if not groups_file then return; end + + module:hook("roster-load", inject_roster_contacts); + datamanager.add_callback(remove_virtual_contacts); + + groups = { default = {} }; + + local curr_group = "default"; + for line in io.lines(groups_file) do + if line:match("^%[%w+%]$") then + curr_group = line:match("^%[(%w+)%]$"); + groups[curr_group] = groups[curr_group] or {}; + else + -- Add JID + local jid = jid_prep(line); + if jid then + groups[curr_group][jid] = true; + members[jid] = members[jid] or {}; + members[jid][#members[jid]+1] = curr_group; + end + end + end + module:log("info", "Groups loaded successfully"); +end + +function module.unload() + datamanager.remove_callback(remove_virtual_contacts); +end -- cgit v1.2.3 From 78e3f4adf5e346076de8e1c0031509346c1490c8 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 22 Jun 2009 22:02:04 +0100 Subject: mod_groups: Support for public groups, and extra logging --- plugins/mod_groups.lua | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'plugins/mod_groups.lua') diff --git a/plugins/mod_groups.lua b/plugins/mod_groups.lua index 8a9e263a..7a581717 100644 --- a/plugins/mod_groups.lua +++ b/plugins/mod_groups.lua @@ -1,6 +1,6 @@ local groups = { default = {} }; -local members = {}; +local members = { [false] = {} }; local groups_file; @@ -14,9 +14,7 @@ function inject_roster_contacts(username, host, roster) local bare_jid = username.."@"..host; if not members[bare_jid] then return; end -- Not a member of any groups - -- Find groups this JID is a member of - for _, group_name in ipairs(members[bare_jid]) do - -- Find other people in the same group + local function import_jids_to_roster(group_name) for jid in pairs(groups[group_name]) do -- Add them to roster --module:log("debug", "processing jid %s in group %s", tostring(jid), tostring(group_name)); @@ -31,6 +29,16 @@ function inject_roster_contacts(username, host, roster) end end end + + -- Find groups this JID is a member of + for _, group_name in ipairs(members[bare_jid]) do + import_jids_to_roster(group_name); + end + + -- Import public groups + for _, group_name in ipairs(members[false]) do + import_jids_to_roster(group_name); + end end function remove_virtual_contacts(username, host, datastore, data) @@ -55,16 +63,22 @@ function module.load() datamanager.add_callback(remove_virtual_contacts); groups = { default = {} }; - + members = { [false] = {} }; local curr_group = "default"; for line in io.lines(groups_file) do - if line:match("^%[%w+%]$") then - curr_group = line:match("^%[(%w+)%]$"); + if line:match("^%s*%[.-%]%s*$") then + curr_group = line:match("^%s*%[(.-)%]%s*$"); + if curr_group:match("^%+") then + curr_group = curr_group:gsub("^%+", ""); + members[false][#members[false]+1] = curr_group; -- Is a public group + end + module:log("debug", "New group: %s", tostring(curr_group)); groups[curr_group] = groups[curr_group] or {}; else -- Add JID local jid = jid_prep(line); if jid then + module:log("debug", "New member of %s: %s", tostring(curr_group), tostring(jid)); groups[curr_group][jid] = true; members[jid] = members[jid] or {}; members[jid][#members[jid]+1] = curr_group; -- cgit v1.2.3