From edc68f5407fb091564fdd7430b166297b0788795 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 17 Feb 2025 22:57:58 +0000 Subject: [PATCH 1/2] mod_invites: Fix traceback when no flags passed --- plugins/mod_invites.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/mod_invites.lua b/plugins/mod_invites.lua index 73a0253a9..0da932157 100644 --- a/plugins/mod_invites.lua +++ b/plugins/mod_invites.lua @@ -255,16 +255,16 @@ module:add_item("shell-command", { handler = function (self, user_jid, opts) --luacheck: ignore 212/self local username = jid_split(user_jid); - local roles = opts.role or {}; - local groups = opts.group or {}; + local roles = opts and opts.role 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 table.insert(roles, 1, "prosody:admin"); end local ttl; - if opts.expires_after then + if opts and opts.expires_after then ttl = human_io.parse_duration(opts.expires_after); if not ttl then return false, "Unable to parse duration: "..opts.expires_after; @@ -325,13 +325,13 @@ module:add_item("shell-command", { return nil, "Supply the JID of the account you want the recipient to become a contact of"; end 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); if not ttl then return nil, "Unable to parse duration: "..opts.expires_after; 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 return true, invite.landing_page or invite.uri; end; From 13dc010593fc7968faa3bd713a43893a2dff4f19 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 17 Feb 2025 23:06:06 +0000 Subject: [PATCH 2/2] mod_invites: Hide --group flag unless mod_invites_groups is enabled The WIP groups support is not complete yet, and won't work without extra modules (which are not yet a part of Prosody). For now we hide --group support unless mod_invites_groups (community module) is specified in modules_enabled. --- plugins/mod_invites.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/mod_invites.lua b/plugins/mod_invites.lua index 0da932157..c6a66a8fe 100644 --- a/plugins/mod_invites.lua +++ b/plugins/mod_invites.lua @@ -239,6 +239,11 @@ end module:hook("invite-created", add_landing_url, -1); --- 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", { section = "invite"; section_desc = "Create and manage invitations"; @@ -249,7 +254,7 @@ module:add_item("shell-command", { }; host_selector = "user_jid"; flags = { - array_params = { role = true, group = true }; + array_params = { role = true, group = have_group_invites }; value_params = { expires_after = true }; };