Hessenuk/DiscordTickets
Hessenuk/DiscordTickets
2
0
Fork 0
mirror of https://github.com/Hessenuk/DiscordTickets.git synced 2024-12-23 00:03:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added try/catch block to named args parsing

Browse Source
This commit is contained in:
Isaac 2021-05-10 23:38:55 +01:00
parent d9ece4beca
commit edee95105f
No known key found for this signature in database
GPG Key ID: F6812DBC6719B4E3
2 changed files with 57 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/locales/en-GB.json
View File

@ -12,6 +12,10 @@
"example": "**Example:** `%s`"
},
"description": "**Usage:**\n`%s`\n\n**Example:**\n`%s`\n\nRequired arguments are prefixed with `❗`.",
"invalid_named_args": {
"description": "There is an error in your command syntax: `%s`.\nType `%s` for an example.\nPlease ask a member of staff if you are unsure.",
"title": ":x: Invalid syntax"
},
"named_args": "This command uses named arguments.\n\n",
"title": "`%s` command usage"
},
@ -32,31 +36,31 @@
"name": "blacklist",
"response": {
"empty_list": {
"title": "📃 Blacklisted members and roles",
"description": "There are no members or roles blacklisted. Type `%sblacklist <memberOrRole>` to add a member or role to the blacklist."
"description": "There are no members or roles blacklisted. Type `%sblacklist <memberOrRole>` to add a member or role to the blacklist.",
"title": "📃 Blacklisted members and roles"
},
"illegal_action": {
"title": "❌ You can't blacklist this member",
"description": "%s is a staff member and cannot be blacklisted."
"description": "%s is a staff member and cannot be blacklisted.",
"title": "❌ You can't blacklist this member"
},
"list": {
"title": "📃 Blacklisted members and roles"
},
"member_added": {
"title": "✅ Added member to blacklist",
"description": "<@%s> has been added to the blacklist. They will no longer be able to interact with the bot."
"description": "<@%s> has been added to the blacklist. They will no longer be able to interact with the bot.",
"title": "✅ Added member to blacklist"
},
"member_removed": {
"title": "✅ Removed member from blacklist",
"description": "<@%s> has been removed from the blacklist. They can now use the bot again."
"description": "<@%s> has been removed from the blacklist. They can now use the bot again.",
"title": "✅ Removed member from blacklist"
},
"role_added": {
"title": "✅ Added role to blacklist",
"description": "<@&%s> has been added to the blacklist. Members with this role will no longer be able to interact with the bot."
"description": "<@&%s> has been added to the blacklist. Members with this role will no longer be able to interact with the bot.",
"title": "✅ Added role to blacklist"
},
"role_removed": {
"title": "✅ Removed role from blacklist",
"description": "<@&%s> has been removed from the blacklist. Members with this role can now use the bot again."
"description": "<@&%s> has been removed from the blacklist. Members with this role can now use the bot again.",
"title": "✅ Removed role from blacklist"
}
}
},
@ -75,20 +79,20 @@
"name": "close",
"response": {
"closed": {
"title": "✅ Ticket closed",
"description": "This ticket has been closed.\nThe channel will be deleted in 5 seconds."
"description": "This ticket has been closed.\nThe channel will be deleted in 5 seconds.",
"title": "✅ Ticket closed"
},
"closed_by_member": {
"title": "✅ Ticket closed",
"description": "This ticket has been closed by %s.\nThe channel will be deleted in 5 seconds."
"description": "This ticket has been closed by %s.\nThe channel will be deleted in 5 seconds.",
"title": "✅ Ticket closed"
},
"closed_by_member_with_reason": {
"title": "✅ Ticket closed",
"description": "This ticket has been closed by %s: `%s`\nThe channel will be deleted in 5 seconds."
"description": "This ticket has been closed by %s: `%s`\nThe channel will be deleted in 5 seconds.",
"title": "✅ Ticket closed"
},
"closed_with_reason": {
"title": "✅ Ticket closed",
"description": "This ticket has been closed: `%s`\nThe channel will be deleted in 5 seconds."
"description": "This ticket has been closed: `%s`\nThe channel will be deleted in 5 seconds.",
"title": "✅ Ticket closed"
}
}
},
@ -114,37 +118,37 @@
"questions": "Please answer the following questions:\n\n%s",
"response": {
"claimed": {
"title":"✅ Ticket claimed",
"description": "%s has claimed this ticket."
"description": "%s has claimed this ticket.",
"title":"✅ Ticket claimed"
},
"created": {
"title": "✅ Ticket created",
"description": "Your ticket has been created: %s."
"description": "Your ticket has been created: %s.",
"title": "✅ Ticket created"
},
"has_a_ticket": {
"title": "❌ You already have an open ticket",
"description": "Please use your existing ticket (<#%s>) or close it before creating another."
"description": "Please use your existing ticket (<#%s>) or close it before creating another.",
"title": "❌ You already have an open ticket"
},
"max_tickets": {
"title": "❌ You already have %d open tickets",
"description": "Please use `%sclose` to close any unneeded tickets.\n\n%s"
"description": "Please use `%sclose` to close any unneeded tickets.\n\n%s",
"title": "❌ You already have %d open tickets"
},
"no_categories": {
"title": "❌ Can't create ticket",
"description": "A server administrator must create at least one ticket category before a new ticket can be opened."
"description": "A server administrator must create at least one ticket category before a new ticket can be opened.",
"title": "❌ Can't create ticket"
},
"select_category": {
"title": "🔤 Please select the ticket category",
"description": "Select the category most relevant to your ticket's topic:\n\n%s"
"description": "Select the category most relevant to your ticket's topic:\n\n%s",
"title": "🔤 Please select the ticket category"
},
"select_category_timeout": {
"title": "❌ Reaction time expired",
"description": "You took too long to select the ticket category."
"description": "You took too long to select the ticket category.",
"title": "❌ Reaction time expired"
}
},
"request_topic": {
"title": "Ticket topic",
"description": "Please briefly state what this ticket is about in a a few words."
"description": "Please briefly state what this ticket is about in a a few words.",
"title": "Ticket topic"
}
},
"panel": {
@ -204,16 +208,16 @@
}
},
"command_execution_error": {
"title": "⚠️",
"description": "An unexpected error occurred during command execution.\nPlease ask an administrator to check the console output / logs for details."
"description": "An unexpected error occurred during command execution.\nPlease ask an administrator to check the console output / logs for details.",
"title": "⚠️"
},
"message_will_be_deleted_in": "This message will be deleted in %d seconds",
"missing_permissions": {
"title": "❌",
"description": "You do not have the permissions required to use this command:\n%s"
"description": "You do not have the permissions required to use this command:\n%s",
"title": "❌"
},
"staff_only": {
"title": "❌",
"description": "You must be a member of staff to use this command."
"description": "You must be a member of staff to use this command.",
"title": "❌"
}
}

12
src/modules/commands/manager.js
View File

@ -156,7 +156,17 @@ module.exports = class CommandManager {
let args = raw_args;
if (cmd.process_args) {
args = parseArgs(cmd.args, { argv: argv(raw_args) });
try {
args = parseArgs(cmd.args, { argv: argv(raw_args) });
} catch (error) {
let help_cmd = `${settings.command_prefix}${i18n('commands.help.name')} ${cmd_name}`;
return await message.channel.send(
new MessageEmbed()
.setColor(settings.error_colour)
.setTitle(i18n('cmd_usage.invalid_named_args.title'))
.setDescription(i18n('cmd_usage.invalid_named_args.description', error.message, help_cmd))
);
}
for (let arg of cmd.args) {
if (arg.required && args[arg.name] === undefined) {
return await cmd.sendUsage(message.channel, cmd_name); // send usage if any required arg is missing