Change sacrifice command embed colours to go green when successful from red (#237)
All checks were successful
Deploy To Stage / build (push) Successful in 2m30s
Deploy To Stage / deploy (push) Successful in 16s

# Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

- Update the sacrifice command so that the embed starts red, goes grey if cancelled, and goes green if successful
- Fix event not checking if the user who ran the command is the same user who clicked the button
- Remove duplicated card name in the embed, didn't need it in the footer as well as the main body

#203, #230, #238

## Type of change

Please delete options that are not relevant.

- [x] New feature (non-breaking change which adds functionality)

# How Has This Been Tested?

Please describe the tests that you ran to verify the changes. Provide instructions so we can reproduce. Please also list any relevant details to your test configuration.

# Checklist

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that provde my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream modules

Co-authored-by: VylpesTester <tester@vylpes.com>
Reviewed-on: #237
Reviewed-by: VylpesTester <tester@vylpes.com>
Co-authored-by: Ethan Lane <ethan@vylpes.com>
Co-committed-by: Ethan Lane <ethan@vylpes.com>
This commit is contained in:
Ethan Lane 2024-05-24 17:45:57 +01:00 committed by Vylpes
parent 17ea4d9ab4
commit 5f513d740e
3 changed files with 22 additions and 6 deletions

View file

@ -24,6 +24,11 @@ export default class Sacrifice extends ButtonEvent {
const userId = interaction.customId.split(" ")[2]; const userId = interaction.customId.split(" ")[2];
const cardNumber = interaction.customId.split(" ")[3]; const cardNumber = interaction.customId.split(" ")[3];
if (userId != interaction.user.id) {
await interaction.reply("Only the user who created this sacrifice can confirm it.");
return;
}
const cardInInventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber); const cardInInventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber);
if (!cardInInventory) { if (!cardInInventory) {
@ -67,8 +72,8 @@ export default class Sacrifice extends ButtonEvent {
const embed = new EmbedBuilder() const embed = new EmbedBuilder()
.setTitle("Card Sacrificed") .setTitle("Card Sacrificed")
.setDescription(description.join("\n")) .setDescription(description.join("\n"))
.setColor(EmbedColours.Ok) .setColor(EmbedColours.Green)
.setFooter({ text: `${interaction.user.username} · ${cardData.card.name}` }); .setFooter({ text: `${interaction.user.username}` });
const row = new ActionRowBuilder<ButtonBuilder>() const row = new ActionRowBuilder<ButtonBuilder>()
.addComponents([ .addComponents([
@ -94,6 +99,11 @@ export default class Sacrifice extends ButtonEvent {
const userId = interaction.customId.split(" ")[2]; const userId = interaction.customId.split(" ")[2];
const cardNumber = interaction.customId.split(" ")[3]; const cardNumber = interaction.customId.split(" ")[3];
if (userId != interaction.user.id) {
await interaction.reply("Only the user who created this sacrifice can cancel it.");
return;
}
const cardInInventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber); const cardInInventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber);
if (!cardInInventory) { if (!cardInInventory) {
@ -122,8 +132,8 @@ export default class Sacrifice extends ButtonEvent {
const embed = new EmbedBuilder() const embed = new EmbedBuilder()
.setTitle("Sacrifice Cancelled") .setTitle("Sacrifice Cancelled")
.setDescription(description.join("\n")) .setDescription(description.join("\n"))
.setColor(EmbedColours.Error) .setColor(EmbedColours.Grey)
.setFooter({ text: `${interaction.user.username} · ${cardData.card.name}` }); .setFooter({ text: `${interaction.user.username}` });
const row = new ActionRowBuilder<ButtonBuilder>() const row = new ActionRowBuilder<ButtonBuilder>()
.addComponents([ .addComponents([

View file

@ -50,8 +50,8 @@ export default class Sacrifice extends Command {
const embed = new EmbedBuilder() const embed = new EmbedBuilder()
.setTitle("Sacrifice") .setTitle("Sacrifice")
.setDescription(description.join("\n")) .setDescription(description.join("\n"))
.setColor(EmbedColours.Grey) .setColor(EmbedColours.Error)
.setFooter({ text: `${interaction.user.username} · ${cardData.card.name}` }); .setFooter({ text: `${interaction.user.username}` });
const row = new ActionRowBuilder<ButtonBuilder>() const row = new ActionRowBuilder<ButtonBuilder>()
.addComponents([ .addComponents([

View file

@ -1,8 +1,14 @@
export default class EmbedColours { export default class EmbedColours {
// General
public static readonly Ok = 0x3050ba; public static readonly Ok = 0x3050ba;
public static readonly Success = 0x50c878; public static readonly Success = 0x50c878;
public static readonly Error = 0xff0000; public static readonly Error = 0xff0000;
// Colours
public static readonly Grey = 0xd3d3d3; public static readonly Grey = 0xd3d3d3;
public static readonly Green = 0x228B22;
// Card Types
public static readonly BronzeCard = 0xcd7f32; public static readonly BronzeCard = 0xcd7f32;
public static readonly SilverCard = 0xc0c0c0; public static readonly SilverCard = 0xc0c0c0;
public static readonly GoldCard = 0xffd700; public static readonly GoldCard = 0xffd700;