mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 05:07:42 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 13.0->trunk

Browse source
This commit is contained in:
Matthew Wild 2025-02-17 23:06:26 +00:00
commit bde377c10a
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
plugins/mod_invites.lua
View file

@ -239,6 +239,11 @@ end
module:hook("invite-created", add_landing_url, -1); module:hook("invite-created", add_landing_url, -1);
--- shell command --- shell command
-- COMPAT: Dynamic groups are work in progress as of 13.0, so we'll use the
-- presence of mod_invites_groups (a community module) to determine whether to
-- expose our support for invites to groups.
local have_group_invites = module:get_option_inherited_set("modules_enabled"):contains("invites_groups");
module:add_item("shell-command", { module:add_item("shell-command", {
section = "invite"; section = "invite";
section_desc = "Create and manage invitations"; section_desc = "Create and manage invitations";
@ -249,22 +254,22 @@ module:add_item("shell-command", {
}; };
host_selector = "user_jid"; host_selector = "user_jid";
flags = { flags = {
array_params = { role = true, group = true }; array_params = { role = true, group = have_group_invites };
value_params = { expires_after = true }; value_params = { expires_after = true };
}; };
handler = function (self, user_jid, opts) --luacheck: ignore 212/self handler = function (self, user_jid, opts) --luacheck: ignore 212/self
local username = jid_split(user_jid); local username = jid_split(user_jid);
local roles = opts.role or {}; local roles = opts and opts.role or {};
local groups = opts.group or {}; local groups = opts and opts.group or {};
if opts.admin then if opts and opts.admin then
-- Insert it first since we don't get order out of argparse -- Insert it first since we don't get order out of argparse
table.insert(roles, 1, "prosody:admin"); table.insert(roles, 1, "prosody:admin");
end end
local ttl; local ttl;
if opts.expires_after then if opts and opts.expires_after then
ttl = human_io.parse_duration(opts.expires_after); ttl = human_io.parse_duration(opts.expires_after);
if not ttl then if not ttl then
return false, "Unable to parse duration: "..opts.expires_after; return false, "Unable to parse duration: "..opts.expires_after;
@ -325,13 +330,13 @@ module:add_item("shell-command", {
return nil, "Supply the JID of the account you want the recipient to become a contact of"; return nil, "Supply the JID of the account you want the recipient to become a contact of";
end end
local ttl; local ttl;
if opts.expires_after then if opts and opts.expires_after then
ttl = require "prosody.util.human.io".parse_duration(opts.expires_after); ttl = require "prosody.util.human.io".parse_duration(opts.expires_after);
if not ttl then if not ttl then
return nil, "Unable to parse duration: "..opts.expires_after; return nil, "Unable to parse duration: "..opts.expires_after;
end end
end end
local invite, err = create_contact(username, opts.allow_registration, nil, ttl); local invite, err = create_contact(username, opts and opts.allow_registration, nil, ttl);
if not invite then return nil, err; end if not invite then return nil, err; end
return true, invite.landing_page or invite.uri; return true, invite.landing_page or invite.uri;
end; end;