prosody-modules: mod_groups_internal/mod_groups

annotate mod_groups_internal/mod_groups_internal.lua @ 6550:f9d93d7cd6d5

mod_firewall: marks: Add commands for managing marks

author	Matthew Wild <mwild1@gmail.com>
date	Sun, 24 May 2026 18:50:41 +0100
parents	4fd1ad56176b
children

rev	line source
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	1 local rostermanager = require"core.rostermanager";
4388 7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	2 local modulemanager = require"core.modulemanager";
5685 9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	3 local array = require "util.array";
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	4 local id = require "util.id";
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	5 local jid = require "util.jid";
4399 846b7af5588c mod_groups_internal: send invite to new members of groups Jonas Schäfer <jonas@wielicki.name> parents: 4392 diff changeset	6 local st = require "util.stanza";
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	7 local jid_join = jid.join;
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	8 local host = module.host;
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	9
5685 9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	10 local group_info_store = module:open_store("group_info", "keyval+");
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	11 local group_members_store = module:open_store("groups");
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	12 local group_memberships = module:open_store("groups", "map");
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	13
6103 f80db102fdb1 mod_groups_internal: Disable MUC integration by default Matthew Wild <mwild1@gmail.com> parents: 5825 diff changeset	14 local muc_host_name = module:get_option("groups_muc_host");
4388 7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	15 local muc_host = nil;
7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	16
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	17 local is_contact_subscribed = rostermanager.is_contact_subscribed;
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	18
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	19 -- Make a one-way subscription. User will see when contact is online,
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	20 -- contact will not see when user is online.
5800 8566a423da88 mod_groups_internal: Set group names as roster groups Kim Alvefur <zash@zash.se> parents: 5795 diff changeset	21 local function subscribe(user, user_jid, contact, contact_jid, group_name)
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	22 -- Update user's roster to say subscription request is pending...
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	23 rostermanager.set_contact_pending_out(user, host, contact_jid);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	24 -- Update contact's roster to say subscription request is pending...
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	25 rostermanager.set_contact_pending_in(contact, host, user_jid);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	26 -- Update contact's roster to say subscription request approved...
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	27 rostermanager.subscribed(contact, host, user_jid);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	28 -- Update user's roster to say subscription request approved...
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	29 rostermanager.process_inbound_subscription_approval(user, host, contact_jid);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	30
5800 8566a423da88 mod_groups_internal: Set group names as roster groups Kim Alvefur <zash@zash.se> parents: 5795 diff changeset	31 if group_name then
8566a423da88 mod_groups_internal: Set group names as roster groups Kim Alvefur <zash@zash.se> parents: 5795 diff changeset	32 local user_roster = rostermanager.load_roster(user, host);
8566a423da88 mod_groups_internal: Set group names as roster groups Kim Alvefur <zash@zash.se> parents: 5795 diff changeset	33 user_roster[contact_jid].groups[group_name] = true;
6177 8ff8121ff603 mod_groups_internal: Save roster after adding group info (thanks gtech1) Matthew Wild <mwild1@gmail.com> parents: 6147 diff changeset	34 rostermanager.save_roster(user, host, user_roster, contact_jid);
5800 8566a423da88 mod_groups_internal: Set group names as roster groups Kim Alvefur <zash@zash.se> parents: 5795 diff changeset	35 end
8566a423da88 mod_groups_internal: Set group names as roster groups Kim Alvefur <zash@zash.se> parents: 5795 diff changeset	36
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	37 -- Push updates to both rosters
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	38 rostermanager.roster_push(user, host, contact_jid);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	39 rostermanager.roster_push(contact, host, user_jid);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	40 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	41
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	42 local function user_groups(username)
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	43 return pairs(group_memberships:get_all(username) or {});
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	44 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	45
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	46 local function do_single_group_subscriptions(username, group_id)
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	47 local members = group_members_store:get(group_id);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	48 if not members then return; end
5800 8566a423da88 mod_groups_internal: Set group names as roster groups Kim Alvefur <zash@zash.se> parents: 5795 diff changeset	49 local group_name = group_info_store:get_key(group_id, "name");
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	50 local user_jid = jid_join(username, host);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	51 for membername in pairs(members) do
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	52 if membername ~= username then
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	53 local member_jid = jid_join(membername, host);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	54 if not is_contact_subscribed(username, host, member_jid) then
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	55 module:log("debug", "[group %s] Subscribing %s to %s", member_jid, user_jid);
5800 8566a423da88 mod_groups_internal: Set group names as roster groups Kim Alvefur <zash@zash.se> parents: 5795 diff changeset	56 subscribe(membername, member_jid, username, user_jid, group_name);
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	57 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	58 if not is_contact_subscribed(membername, host, user_jid) then
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	59 module:log("debug", "[group %s] Subscribing %s to %s", user_jid, member_jid);
5800 8566a423da88 mod_groups_internal: Set group names as roster groups Kim Alvefur <zash@zash.se> parents: 5795 diff changeset	60 subscribe(username, user_jid, membername, member_jid, group_name);
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	61 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	62 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	63 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	64 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	65
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	66 local function do_all_group_subscriptions_by_user(username)
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	67 for group_id in user_groups(username) do
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	68 do_single_group_subscriptions(username, group_id);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	69 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	70 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	71
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	72 local function do_all_group_subscriptions_by_group(group_id)
4419 1185acb2ab91 mod_groups_internal: handle empty groups correctly Jonas Schäfer <jonas@wielicki.name> parents: 4418 diff changeset	73 local members = get_members(group_id)
1185acb2ab91 mod_groups_internal: handle empty groups correctly Jonas Schäfer <jonas@wielicki.name> parents: 4418 diff changeset	74 if not members then
1185acb2ab91 mod_groups_internal: handle empty groups correctly Jonas Schäfer <jonas@wielicki.name> parents: 4418 diff changeset	75 return
1185acb2ab91 mod_groups_internal: handle empty groups correctly Jonas Schäfer <jonas@wielicki.name> parents: 4418 diff changeset	76 end
1185acb2ab91 mod_groups_internal: handle empty groups correctly Jonas Schäfer <jonas@wielicki.name> parents: 4418 diff changeset	77 for membername in pairs(members) do
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	78 do_single_group_subscriptions(membername, group_id);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	79 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	80 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	81
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	82 module:hook("resource-bind", function(event)
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	83 module:log("debug", "Updating group subscriptions...");
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	84 do_all_group_subscriptions_by_user(event.session.username);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	85 end);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	86
5685 9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	87 local function _create_muc_room(name)
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	88 if not muc_host_name then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	89 module:log("error", "cannot create group MUC: no MUC host configured")
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	90 return nil, "service-unavailable"
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	91 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	92 if not muc_host then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	93 module:log("error", "cannot create group MUC: MUC host %s not configured properly", muc_host_name)
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	94 return nil, "internal-server-error"
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	95 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	96
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	97 local muc_jid = jid.prep(id.short() .. "@" .. muc_host_name);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	98 local room = muc_host.create_room(muc_jid)
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	99 if not room then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	100 return nil, "internal-server-error"
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	101 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	102
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	103 local ok = pcall(function ()
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	104 room:set_public(false);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	105 room:set_persistent(true);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	106 room:set_members_only(true);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	107 room:set_allow_member_invites(false);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	108 room:set_moderated(false);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	109 room:set_whois("anyone");
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	110 room:set_name(name);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	111 end);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	112
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	113 if not ok then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	114 module:log("error", "Failed to configure group MUC %s", muc_jid);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	115 room:destroy();
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	116 return nil, "internal-server-error";
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	117 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	118
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	119 return muc_jid, room;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	120 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	121
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	122 --luacheck: ignore 131
5685 9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	123 function create(group_info, create_default_muc, group_id)
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	124 if not group_info.name then
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	125 return nil, "group-name-required";
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	126 end
4385 dfb34cc97028 mod_groups_internal: allow specifying a group_id on create Jonas Schäfer <jonas@wielicki.name> parents: 4383 diff changeset	127 if group_id then
dfb34cc97028 mod_groups_internal: allow specifying a group_id on create Jonas Schäfer <jonas@wielicki.name> parents: 4383 diff changeset	128 if exists(group_id) then
dfb34cc97028 mod_groups_internal: allow specifying a group_id on create Jonas Schäfer <jonas@wielicki.name> parents: 4383 diff changeset	129 return nil, "conflict"
dfb34cc97028 mod_groups_internal: allow specifying a group_id on create Jonas Schäfer <jonas@wielicki.name> parents: 4383 diff changeset	130 end
dfb34cc97028 mod_groups_internal: allow specifying a group_id on create Jonas Schäfer <jonas@wielicki.name> parents: 4383 diff changeset	131 else
dfb34cc97028 mod_groups_internal: allow specifying a group_id on create Jonas Schäfer <jonas@wielicki.name> parents: 4383 diff changeset	132 group_id = id.short();
dfb34cc97028 mod_groups_internal: allow specifying a group_id on create Jonas Schäfer <jonas@wielicki.name> parents: 4383 diff changeset	133 end
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	134
4388 7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	135 local muc_jid = nil
7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	136 local room = nil
5685 9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	137 if create_default_muc then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	138 muc_jid, room = _create_muc_room(group_info.name);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	139 if not muc_jid then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	140 -- MUC creation failed, fail to create group
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	141 delete(group_id)
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	142 return nil, room;
4388 7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	143 end
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	144 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	145
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	146 local ok = group_info_store:set(group_id, {
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	147 name = group_info.name;
4388 7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	148 muc_jid = muc_jid;
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	149 });
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	150 if not ok then
4388 7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	151 if room then
4423 ca821df93cb9 mod_groups_internal: correctly destroy MUC associated with group Jonas Schäfer <jonas@wielicki.name> parents: 4419 diff changeset	152 room:destroy()
4388 7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	153 end
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	154 return nil, "internal-server-error";
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	155 end
4388 7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	156
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	157 return group_id;
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	158 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	159
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	160 function get_info(group_id)
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	161 return group_info_store:get(group_id);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	162 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	163
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	164 function set_info(group_id, info)
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	165 if not info then
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	166 return nil, "bad-request"
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	167 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	168
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	169 if not info.name or #info.name == 0 then
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	170 return nil, "bad-request"
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	171 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	172
4415 c7424b96c75e mod_groups_internal: maintain the name of the associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4407 diff changeset	173 -- TODO: we should probably prohibit changing/removing the MUC JID of
c7424b96c75e mod_groups_internal: maintain the name of the associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4407 diff changeset	174 -- an existing group.
c7424b96c75e mod_groups_internal: maintain the name of the associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4407 diff changeset	175 if info.muc_jid then
4706 428861d1d1e4 mod_groups_internal: Fix accidental global [luacheck] Kim Alvefur <zash@zash.se> parents: 4430 diff changeset	176 local room = muc_host.get_room_from_jid(info.muc_jid);
4415 c7424b96c75e mod_groups_internal: maintain the name of the associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4407 diff changeset	177 room:set_name(info.name);
c7424b96c75e mod_groups_internal: maintain the name of the associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4407 diff changeset	178 end
c7424b96c75e mod_groups_internal: maintain the name of the associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4407 diff changeset	179
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	180 local ok = group_info_store:set(group_id, info);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	181 if not ok then
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	182 return nil, "internal-server-error";
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	183 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	184 return true
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	185 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	186
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	187 function get_members(group_id)
5685 9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	188 return group_members_store:get(group_id) or {};
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	189 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	190
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	191 function exists(group_id)
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	192 return not not get_info(group_id);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	193 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	194
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	195 function get_user_groups(username)
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	196 local groups = {};
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	197 do
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	198 local group_set = group_memberships:get_all(username);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	199 if group_set then
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	200 for group_id in pairs(group_set) do
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	201 table.insert(groups, group_id);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	202 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	203 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	204 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	205 return groups;
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	206 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	207
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	208 function delete(group_id)
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	209 if group_members_store:set(group_id, nil) then
4407 105586ca9a79 mod_groups_internal: Style Matthew Wild <mwild1@gmail.com> parents: 4406 diff changeset	210 local group_info = get_info(group_id);
6147 e2d130104b98 mod_groups_internal: Delete all associated MUCs when deleting a group Rémi Bardon <remi@remibardon.name> parents: 6103 diff changeset	211 if group_info then
e2d130104b98 mod_groups_internal: Delete all associated MUCs when deleting a group Rémi Bardon <remi@remibardon.name> parents: 6103 diff changeset	212 if group_info.muc_jid then
e2d130104b98 mod_groups_internal: Delete all associated MUCs when deleting a group Rémi Bardon <remi@remibardon.name> parents: 6103 diff changeset	213 local room = muc_host.get_room_from_jid(group_info.muc_jid)
e2d130104b98 mod_groups_internal: Delete all associated MUCs when deleting a group Rémi Bardon <remi@remibardon.name> parents: 6103 diff changeset	214 if room then
e2d130104b98 mod_groups_internal: Delete all associated MUCs when deleting a group Rémi Bardon <remi@remibardon.name> parents: 6103 diff changeset	215 room:destroy()
e2d130104b98 mod_groups_internal: Delete all associated MUCs when deleting a group Rémi Bardon <remi@remibardon.name> parents: 6103 diff changeset	216 end
e2d130104b98 mod_groups_internal: Delete all associated MUCs when deleting a group Rémi Bardon <remi@remibardon.name> parents: 6103 diff changeset	217 end
6314 4fd1ad56176b mod_groups_internal: Fix traceback on deletion when group has no MUCs Matthew Wild <mwild1@gmail.com> parents: 6177 diff changeset	218 if group_info.mucs then
4fd1ad56176b mod_groups_internal: Fix traceback on deletion when group has no MUCs Matthew Wild <mwild1@gmail.com> parents: 6177 diff changeset	219 for _, muc_jid in ipairs(group_info.mucs) do
4fd1ad56176b mod_groups_internal: Fix traceback on deletion when group has no MUCs Matthew Wild <mwild1@gmail.com> parents: 6177 diff changeset	220 local room = muc_host.get_room_from_jid(muc_jid)
4fd1ad56176b mod_groups_internal: Fix traceback on deletion when group has no MUCs Matthew Wild <mwild1@gmail.com> parents: 6177 diff changeset	221 if room then
4fd1ad56176b mod_groups_internal: Fix traceback on deletion when group has no MUCs Matthew Wild <mwild1@gmail.com> parents: 6177 diff changeset	222 room:destroy()
4fd1ad56176b mod_groups_internal: Fix traceback on deletion when group has no MUCs Matthew Wild <mwild1@gmail.com> parents: 6177 diff changeset	223 end
6147 e2d130104b98 mod_groups_internal: Delete all associated MUCs when deleting a group Rémi Bardon <remi@remibardon.name> parents: 6103 diff changeset	224 end
4423 ca821df93cb9 mod_groups_internal: correctly destroy MUC associated with group Jonas Schäfer <jonas@wielicki.name> parents: 4419 diff changeset	225 end
4389 6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	226 end
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	227 return group_info_store:set(group_id, nil);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	228 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	229 return nil, "internal-server-error";
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	230 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	231
4386 6357ac65b4eb mod_groups_internal: allow delay of roster sync on group change Jonas Schäfer <jonas@wielicki.name> parents: 4385 diff changeset	232 function add_member(group_id, username, delay_update)
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	233 local group_info = group_info_store:get(group_id);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	234 if not group_info then
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	235 return nil, "group-not-found";
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	236 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	237 if not group_memberships:set(group_id, username, {}) then
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	238 return nil, "internal-server-error";
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	239 end
5822 fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	240
4389 6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	241 if group_info.muc_jid then
6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	242 local room = muc_host.get_room_from_jid(group_info.muc_jid);
6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	243 if room then
6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	244 local user_jid = username .. "@" .. host;
4407 105586ca9a79 mod_groups_internal: Style Matthew Wild <mwild1@gmail.com> parents: 4406 diff changeset	245 room:set_affiliation(true, user_jid, "member");
4399 846b7af5588c mod_groups_internal: send invite to new members of groups Jonas Schäfer <jonas@wielicki.name> parents: 4392 diff changeset	246 module:send(st.message(
846b7af5588c mod_groups_internal: send invite to new members of groups Jonas Schäfer <jonas@wielicki.name> parents: 4392 diff changeset	247 { from = group_info.muc_jid, to = user_jid }
846b7af5588c mod_groups_internal: send invite to new members of groups Jonas Schäfer <jonas@wielicki.name> parents: 4392 diff changeset	248 ):tag("x", {
846b7af5588c mod_groups_internal: send invite to new members of groups Jonas Schäfer <jonas@wielicki.name> parents: 4392 diff changeset	249 xmlns = "jabber:x:conference",
846b7af5588c mod_groups_internal: send invite to new members of groups Jonas Schäfer <jonas@wielicki.name> parents: 4392 diff changeset	250 jid = group_info.muc_jid
846b7af5588c mod_groups_internal: send invite to new members of groups Jonas Schäfer <jonas@wielicki.name> parents: 4392 diff changeset	251 }):up());
4407 105586ca9a79 mod_groups_internal: Style Matthew Wild <mwild1@gmail.com> parents: 4406 diff changeset	252 module:log("debug", "set user %s to be member in %s and sent invite", username, group_info.muc_jid);
4389 6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	253 else
4418 8c31d4b872c3 mod_groups_internal: fix log message not appearing Jonas Schäfer <jonas@wielicki.name> parents: 4417 diff changeset	254 module:log("warn", "failed to update affiliation for %s in %s", username, group_info.muc_jid);
4389 6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	255 end
5822 fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	256 elseif group_info.mucs then
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	257 local user_jid = username .. "@" .. host;
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	258 for i = #group_info.mucs, 1, -1 do
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	259 local muc_jid = group_info.mucs[i];
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	260 local room = muc_host.get_room_from_jid(muc_jid);
5824 f1e816df1f73 mod_groups_internal: Also remove MUCs that still exist, but have been destroyed Matthew Wild <mwild1@gmail.com> parents: 5822 diff changeset	261 if not room or room._data.destroyed then
5822 fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	262 -- MUC no longer available, for some reason
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	263 -- Let's remove it from the circle metadata...
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	264 table.remove(group_info.mucs, i);
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	265 group_info_store:set_key(group_id, "mucs", group_info.mucs);
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	266 else
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	267 room:set_affiliation(true, user_jid, "member");
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	268 module:send(st.message(
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	269 { from = muc_jid, to = user_jid }
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	270 ):tag("x", {
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	271 xmlns = "jabber:x:conference",
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	272 jid = muc_jid
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	273 }):up());
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	274 module:log("debug", "set user %s to be member in %s and sent invite", username, muc_jid);
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	275 end
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	276 end
4389 6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	277 end
5822 fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	278
4424 679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	279 module:fire_event(
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	280 "group-user-added",
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	281 {
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	282 id = group_id,
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	283 user = username,
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	284 host = host,
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	285 group_info = group_info,
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	286 }
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	287 )
4386 6357ac65b4eb mod_groups_internal: allow delay of roster sync on group change Jonas Schäfer <jonas@wielicki.name> parents: 4385 diff changeset	288 if not delay_update then
6357ac65b4eb mod_groups_internal: allow delay of roster sync on group change Jonas Schäfer <jonas@wielicki.name> parents: 4385 diff changeset	289 do_all_group_subscriptions_by_group(group_id);
6357ac65b4eb mod_groups_internal: allow delay of roster sync on group change Jonas Schäfer <jonas@wielicki.name> parents: 4385 diff changeset	290 end
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	291 return true;
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	292 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	293
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	294 function remove_member(group_id, username)
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	295 local group_info = group_info_store:get(group_id);
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	296 if not group_info then
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	297 return nil, "group-not-found";
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	298 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	299 if not group_memberships:set(group_id, username, nil) then
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	300 return nil, "internal-server-error";
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	301 end
4389 6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	302 if group_info.muc_jid then
6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	303 local room = muc_host.get_room_from_jid(group_info.muc_jid);
6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	304 if room then
6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	305 local user_jid = username .. "@" .. host;
4407 105586ca9a79 mod_groups_internal: Style Matthew Wild <mwild1@gmail.com> parents: 4406 diff changeset	306 room:set_affiliation(true, user_jid, nil);
4389 6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	307 else
4418 8c31d4b872c3 mod_groups_internal: fix log message not appearing Jonas Schäfer <jonas@wielicki.name> parents: 4417 diff changeset	308 module:log("warn", "failed to update affiliation for %s in %s", username, group_info.muc_jid);
4389 6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	309 end
5822 fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	310 elseif group_info.mucs then
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	311 local user_jid = username .. "@" .. host;
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	312 for _, muc_jid in ipairs(group_info.mucs) do
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	313 local room = muc_host.get_room_from_jid(muc_jid);
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	314 if room then
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	315 room:set_affiliation(true, user_jid, nil);
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	316 else
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	317 module:log("warn", "failed to update affiliation for %s in %s", username, muc_jid);
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	318 end
fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	319 end
4389 6cfa313cd524 mod_groups_internal: manage associated MUC Jonas Schäfer <jonas@wielicki.name> parents: 4388 diff changeset	320 end
5822 fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	321
4424 679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	322 module:fire_event(
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	323 "group-user-removed",
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	324 {
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	325 id = group_id,
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	326 user = username,
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	327 host = host,
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	328 group_info = group_info,
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	329 }
679be18e6a5e mod_groups_internal: emit events for group membership changes Jonas Schäfer <jonas@wielicki.name> parents: 4423 diff changeset	330 )
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	331 return true;
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	332 end
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	333
4386 6357ac65b4eb mod_groups_internal: allow delay of roster sync on group change Jonas Schäfer <jonas@wielicki.name> parents: 4385 diff changeset	334 function sync(group_id)
4407 105586ca9a79 mod_groups_internal: Style Matthew Wild <mwild1@gmail.com> parents: 4406 diff changeset	335 do_all_group_subscriptions_by_group(group_id);
4386 6357ac65b4eb mod_groups_internal: allow delay of roster sync on group change Jonas Schäfer <jonas@wielicki.name> parents: 4385 diff changeset	336 end
6357ac65b4eb mod_groups_internal: allow delay of roster sync on group change Jonas Schäfer <jonas@wielicki.name> parents: 4385 diff changeset	337
5685 9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	338 function add_group_chat(group_id, name)
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	339 local group_info = group_info_store:get(group_id);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	340 local mucs = group_info.mucs or {};
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	341
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	342 -- Create the MUC
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	343 local muc_jid, room = _create_muc_room(name);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	344 if not muc_jid then return nil, room; end
5821 c9279845fc41 mod_groups_internal: Save MUC room after creation to commit it to storage Matthew Wild <mwild1@gmail.com> parents: 5820 diff changeset	345 room:save(); -- This ensures the room is committed to storage
c9279845fc41 mod_groups_internal: Save MUC room after creation to commit it to storage Matthew Wild <mwild1@gmail.com> parents: 5820 diff changeset	346
5685 9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	347 table.insert(mucs, muc_jid);
5822 fe3bde6ef95a mod_groups_internal: Sync MUC affiliations for multi-MUC groups Matthew Wild <mwild1@gmail.com> parents: 5821 diff changeset	348
5685 9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	349 if group_info.muc_jid then -- COMPAT include old muc_jid into array
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	350 table.insert(mucs, group_info.muc_jid);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	351 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	352 local store_ok, store_err = group_info_store:set_key(group_id, "mucs", mucs);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	353 if not store_ok then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	354 module:log("error", "Failed to store new MUC association: %s", store_err);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	355 room:destroy();
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	356 return nil, "internal-server-error";
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	357 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	358
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	359 -- COMPAT: clear old muc_jid (it's now in mucs array)
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	360 if group_info.muc_jid then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	361 module:log("debug", "Clearing old single-MUC JID");
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	362 group_info.muc_jid = nil;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	363 group_info_store:set_key(group_id, "muc_jid", nil);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	364 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	365
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	366 -- Make existing group members, members of the MUC
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	367 for username in pairs(get_members(group_id)) do
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	368 local user_jid = username .. "@" ..module.host;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	369 room:set_affiliation(true, user_jid, "member");
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	370 module:send(st.message(
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	371 { from = muc_jid, to = user_jid }
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	372 ):tag("x", {
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	373 xmlns = "jabber:x:conference",
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	374 jid = muc_jid
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	375 }):up());
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	376 module:log("debug", "set user %s to be member in %s and sent invite", user_jid, muc_jid);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	377 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	378
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	379 -- Notify other modules (such as mod_groups_muc_bookmarks)
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	380 local muc = {
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	381 jid = muc_jid;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	382 name = name;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	383 };
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	384
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	385 module:fire_event("group-chat-added", {
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	386 group_id = group_id;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	387 group_info = group_info;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	388 muc = muc;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	389 });
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	390
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	391 return muc;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	392 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	393
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	394 function remove_group_chat(group_id, muc_id)
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	395 local group_info = group_info_store:get(group_id);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	396 if not group_info then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	397 return nil, "group-not-found";
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	398 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	399
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	400 local mucs = group_info.mucs;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	401 if not mucs then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	402 if not group_info.muc_jid then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	403 return true;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	404 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	405 -- COMPAT with old single-MUC groups - upgrade to new format
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	406 mucs = {};
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	407 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	408 if group_info.muc_jid then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	409 table.insert(mucs, group_info.muc_jid);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	410 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	411
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	412 local removed;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	413 for i, muc_jid in ipairs(mucs) do
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	414 if muc_id == jid.node(muc_jid) then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	415 removed = table.remove(mucs, i);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	416 break;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	417 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	418 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	419
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	420 if removed then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	421 if not group_info_store:set_key(group_id, "mucs", mucs) then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	422 return nil, "internal-server-error";
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	423 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	424
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	425 if group_info.muc_jid then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	426 -- COMPAT: Now we've set the array, clean up muc_jid
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	427 group_info.muc_jid = nil;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	428 group_info_store:set_key(group_id, "muc_jid", nil);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	429 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	430
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	431 module:log("debug", "Updated group MUC list");
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	432
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	433 local room = muc_host.get_room_from_jid(removed);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	434 if room then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	435 room:destroy();
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	436 else
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	437 module:log("warn", "Removing a group chat, but associated MUC not found (%s)", removed);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	438 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	439
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	440 module:fire_event(
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	441 "group-chat-removed",
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	442 {
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	443 group_id = group_id;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	444 group_info = group_info;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	445 muc = {
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	446 id = muc_id;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	447 jid = removed;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	448 };
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	449 }
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	450 );
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	451 else
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	452 module:log("warn", "Removal of a group chat that can't be found - %s", muc_id);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	453 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	454
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	455 return true;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	456 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	457
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	458 function get_group_chats(group_id)
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	459 local group_info, err = group_info_store:get(group_id);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	460 if not group_info then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	461 module:log("debug", "Unable to load group info: %s - %s", group_id, err);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	462 return nil;
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	463 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	464
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	465 local mucs = group_info.mucs or {};
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	466
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	467 -- COMPAT with single-MUC groups
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	468 if group_info.muc_jid then
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	469 table.insert(mucs, group_info.muc_jid);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	470 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	471
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	472 return array.map(mucs, function (muc_jid)
5820 742142f9771e mod_groups_internal: Fix traceback when room doesn't exist Matthew Wild <mwild1@gmail.com> parents: 5800 diff changeset	473 local room = muc_host.get_room_from_jid(muc_jid);
5685 9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	474 return {
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	475 id = jid.node(muc_jid);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	476 jid = muc_jid;
5820 742142f9771e mod_groups_internal: Fix traceback when room doesn't exist Matthew Wild <mwild1@gmail.com> parents: 5800 diff changeset	477 name = room and room:get_name() or group_info.name;
5825 865c77b5c6dc mod_groups_internal: Add flag to indicate when a linked MUC has been deleted Matthew Wild <mwild1@gmail.com> parents: 5824 diff changeset	478 deleted = not room or room._data.destroyed;
5685 9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	479 };
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	480 end);
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	481 end
9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	482
4430 71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	483 function emit_member_events(group_id)
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	484 local group_info, err = get_info(group_id)
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	485 if group_info == nil then
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	486 return false, err
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	487 end
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	488
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	489 for username in pairs(get_members(group_id)) do
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	490 module:fire_event(
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	491 "group-user-added",
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	492 {
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	493 id = group_id,
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	494 user = username,
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	495 host = host,
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	496 group_info = group_info,
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	497 }
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	498 )
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	499 end
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	500
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	501 return true
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	502 end
71c495fa03f3 mod_groups_internal: allow force-emitting group member addition events Jonas Schäfer <jonas@wielicki.name> parents: 4424 diff changeset	503
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	504 -- Returns iterator over group ids
1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	505 function groups()
5685 9edc698848e9 mod_groups_internal: Update to support multiple MUCs per group Matthew Wild <mwild1@gmail.com> parents: 4707 diff changeset	506 return group_info_store:items();
4383 1e7406b85add mod_groups_internal: new module for grouping beyond mod_adhoc_groups Matthew Wild <mwild1@gmail.com> parents: diff changeset	507 end
4388 7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	508
4417 7e379ccb8ed6 mod_groups_internal: make robust against module reloads Jonas Schäfer <jonas@wielicki.name> parents: 4415 diff changeset	509 local function setup()
4392 e5792ca1d704 mod_groups_internal: fix default value and handling of groups_muc_host Jonas Schäfer <jonas@wielicki.name> parents: 4389 diff changeset	510 if not muc_host_name then
4407 105586ca9a79 mod_groups_internal: Style Matthew Wild <mwild1@gmail.com> parents: 4406 diff changeset	511 module:log("info", "MUC management disabled (groups_muc_host set to nil)");
105586ca9a79 mod_groups_internal: Style Matthew Wild <mwild1@gmail.com> parents: 4406 diff changeset	512 return;
4392 e5792ca1d704 mod_groups_internal: fix default value and handling of groups_muc_host Jonas Schäfer <jonas@wielicki.name> parents: 4389 diff changeset	513 end
e5792ca1d704 mod_groups_internal: fix default value and handling of groups_muc_host Jonas Schäfer <jonas@wielicki.name> parents: 4389 diff changeset	514
4407 105586ca9a79 mod_groups_internal: Style Matthew Wild <mwild1@gmail.com> parents: 4406 diff changeset	515 local target_module = modulemanager.get_module(muc_host_name, "muc");
4388 7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	516 if not target_module then
4407 105586ca9a79 mod_groups_internal: Style Matthew Wild <mwild1@gmail.com> parents: 4406 diff changeset	517 module:log("error", "host %s is not a MUC host -- group management will not work correctly; check your groups_muc_host setting!", muc_host_name);
4388 7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	518 else
4407 105586ca9a79 mod_groups_internal: Style Matthew Wild <mwild1@gmail.com> parents: 4406 diff changeset	519 module:log("debug", "found MUC host at %s", muc_host_name);
4388 7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	520 muc_host = target_module;
7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	521 end
7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	522 end
7de3c955cfe2 mod_groups_internal: allow creating MUCs if a MUC host is linked Jonas Schäfer <jonas@wielicki.name> parents: 4386 diff changeset	523
4707 27f7ed9f50cd mod_groups_internal: Remove deleted user from groups Kim Alvefur <zash@zash.se> parents: 4706 diff changeset	524 module:hook_global("user-deleted", function(event)
27f7ed9f50cd mod_groups_internal: Remove deleted user from groups Kim Alvefur <zash@zash.se> parents: 4706 diff changeset	525 if event.host ~= module.host then return end
27f7ed9f50cd mod_groups_internal: Remove deleted user from groups Kim Alvefur <zash@zash.se> parents: 4706 diff changeset	526 local username = event.username;
27f7ed9f50cd mod_groups_internal: Remove deleted user from groups Kim Alvefur <zash@zash.se> parents: 4706 diff changeset	527 for group_id in user_groups(username) do
27f7ed9f50cd mod_groups_internal: Remove deleted user from groups Kim Alvefur <zash@zash.se> parents: 4706 diff changeset	528 remove_member(group_id, username);
27f7ed9f50cd mod_groups_internal: Remove deleted user from groups Kim Alvefur <zash@zash.se> parents: 4706 diff changeset	529 end
27f7ed9f50cd mod_groups_internal: Remove deleted user from groups Kim Alvefur <zash@zash.se> parents: 4706 diff changeset	530 end);
27f7ed9f50cd mod_groups_internal: Remove deleted user from groups Kim Alvefur <zash@zash.se> parents: 4706 diff changeset	531
4417 7e379ccb8ed6 mod_groups_internal: make robust against module reloads Jonas Schäfer <jonas@wielicki.name> parents: 4415 diff changeset	532 if prosody.start_time then -- server already started
7e379ccb8ed6 mod_groups_internal: make robust against module reloads Jonas Schäfer <jonas@wielicki.name> parents: 4415 diff changeset	533 setup();
7e379ccb8ed6 mod_groups_internal: make robust against module reloads Jonas Schäfer <jonas@wielicki.name> parents: 4415 diff changeset	534 else
7e379ccb8ed6 mod_groups_internal: make robust against module reloads Jonas Schäfer <jonas@wielicki.name> parents: 4415 diff changeset	535 module:hook_global("server-started", setup);
7e379ccb8ed6 mod_groups_internal: make robust against module reloads Jonas Schäfer <jonas@wielicki.name> parents: 4415 diff changeset	536 end

Mercurial > prosody-modules

annotate mod_groups_internal/mod_groups_internal.lua @ 6550:f9d93d7cd6d5