From 2f71d1e5c2175328b7a10f35361df40253dfa98a Mon Sep 17 00:00:00 2001 From: Luke Cotton Date: Fri, 10 Jan 2025 12:36:13 +0000 Subject: [PATCH 1/2] commands(give): let users with `ManageGuild` permission self-run `/give` Fixes: https://github.com/TheBastionBot/Bastion/issues/1077 --- src/commands/give.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/commands/give.ts b/src/commands/give.ts index fc9464562..32fb81175 100644 --- a/src/commands/give.ts +++ b/src/commands/give.ts @@ -43,7 +43,10 @@ class GiveCommand extends Command { const xp = interaction.options.getInteger("xp"); // check whether user is giving it to themselves - if (interaction.user.id !== interaction.guild.ownerId && interaction.user.id === user.id) { + const isGuildOwner = () => interaction.user.id === interaction.guild.ownerId + const isGuildManager = () => interaction.memberPermissions.has(PermissionFlagsBits.ManageGuild) + const isGivingToSelf = () => interaction.user.id === user.id + if (!isGuildOwner() && !isGuildManager() && isGivingToSelf()) { return await interaction.reply((interaction.client as Client).locales.getText(interaction.guildLocale, "giveSelfError")); } From d1f0d525e6b056c116fec85cb10822cf51624edb Mon Sep 17 00:00:00 2001 From: Luke Cotton Date: Fri, 10 Jan 2025 12:58:45 +0000 Subject: [PATCH 2/2] commands(give): add missing semicolons --- src/commands/give.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/commands/give.ts b/src/commands/give.ts index 32fb81175..4d0dfd67b 100644 --- a/src/commands/give.ts +++ b/src/commands/give.ts @@ -43,9 +43,9 @@ class GiveCommand extends Command { const xp = interaction.options.getInteger("xp"); // check whether user is giving it to themselves - const isGuildOwner = () => interaction.user.id === interaction.guild.ownerId - const isGuildManager = () => interaction.memberPermissions.has(PermissionFlagsBits.ManageGuild) - const isGivingToSelf = () => interaction.user.id === user.id + const isGuildOwner = () => interaction.user.id === interaction.guild.ownerId; + const isGuildManager = () => interaction.memberPermissions.has(PermissionFlagsBits.ManageGuild); + const isGivingToSelf = () => interaction.user.id === user.id; if (!isGuildOwner() && !isGuildManager() && isGivingToSelf()) { return await interaction.reply((interaction.client as Client).locales.getText(interaction.guildLocale, "giveSelfError")); }