Fix trade command (#177)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
# 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. - Fix the decline button not working for the initiating user - Update labels on embed to follow "I Receive" and "You Receive" #165 ## Type of change Please delete options that are not relevant. - [x] Bug fix (non-breaking change which fixes an issue) # 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 Reviewed-on: https://gitea.vylpes.xyz/External/card-drop/pulls/177 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:
parent
806dcb9ab3
commit
2f9d80f430
|
@ -100,13 +100,13 @@ export default class Trade extends ButtonEvent {
|
|||
.setImage("https://i.imgur.com/9w5f1ls.gif")
|
||||
.addFields([
|
||||
{
|
||||
name: `${receiveUser.username} is giving`,
|
||||
value: `${giveItem.id}: ${giveItem.name}`,
|
||||
name: "I receieve",
|
||||
value: `${receiveItem.id}: ${receiveItem.name}`,
|
||||
inline: true,
|
||||
},
|
||||
{
|
||||
name: `${giveUser.username} is giving`,
|
||||
value: `${receiveItem.id}: ${receiveItem.name}`,
|
||||
name: "You receieve",
|
||||
value: `${giveItem.id}: ${giveItem.name}`,
|
||||
inline: true,
|
||||
},
|
||||
{
|
||||
|
@ -140,7 +140,7 @@ export default class Trade extends ButtonEvent {
|
|||
// No need to get expiry date
|
||||
const timeoutId = interaction.customId.split(" ")[7];
|
||||
|
||||
if (interaction.user.id !== receiveUserId || interaction.user.id !== giveUserId) {
|
||||
if (interaction.user.id != receiveUserId && interaction.user.id !==giveUserId) {
|
||||
await interaction.reply("You are not the user who the trade is intended for");
|
||||
return;
|
||||
}
|
||||
|
@ -170,13 +170,13 @@ export default class Trade extends ButtonEvent {
|
|||
.setImage("https://i.imgur.com/9w5f1ls.gif")
|
||||
.addFields([
|
||||
{
|
||||
name: `${receiveUser.username} is giving`,
|
||||
value: `${giveItem.id}: ${giveItem.name}`,
|
||||
name: "I Receive",
|
||||
value: `${receiveItem.id}: ${receiveItem.name}`,
|
||||
inline: true,
|
||||
},
|
||||
{
|
||||
name: `${giveUser.username} is giving`,
|
||||
value: `${receiveItem.id}: ${receiveItem.name}`,
|
||||
name: "You Receive",
|
||||
value: `${giveItem.id}: ${giveItem.name}`,
|
||||
inline: true,
|
||||
},
|
||||
{
|
||||
|
|
|
@ -63,19 +63,19 @@ export default class Trade extends Command {
|
|||
const expiry = now.setMinutes(now.getMinutes() + 15);
|
||||
|
||||
const tradeEmbed = new EmbedBuilder()
|
||||
.setTitle("Trade Offer")
|
||||
.setTitle("⚠️ Trade Offer ⚠️")
|
||||
.setDescription(`Trade initiated between ${interaction.user.username} and ${user.username}`)
|
||||
.setColor(EmbedColours.Grey)
|
||||
.setImage("https://media1.tenor.com/m/KkZwKl2AQ2QAAAAd/trade-offer.gif")
|
||||
.addFields([
|
||||
{
|
||||
name: `${interaction.user.username} is giving`,
|
||||
value: `${giveItem.id}: ${giveItem.name}`,
|
||||
name: "I Receive",
|
||||
value: `${receiveItem.id}: ${receiveItem.name}`,
|
||||
inline: true,
|
||||
},
|
||||
{
|
||||
name: `${user.username} is giving`,
|
||||
value: `${receiveItem.id}: ${receiveItem.name}`,
|
||||
name: "You Receive",
|
||||
value: `${giveItem.id}: ${giveItem.name}`,
|
||||
inline: true,
|
||||
},
|
||||
{
|
||||
|
@ -109,13 +109,13 @@ export default class Trade extends Command {
|
|||
.setImage("https://media1.tenor.com/m/KkZwKl2AQ2QAAAAd/trade-offer.gif")
|
||||
.addFields([
|
||||
{
|
||||
name: `${receiveUsername} is giving`,
|
||||
value: `${giveCardNumber}: ${giveCardName}`,
|
||||
name: "I Receive",
|
||||
value: `${receiveCardNumber}: ${receiveCardName}`,
|
||||
inline: true,
|
||||
},
|
||||
{
|
||||
name: `${giveUsername} is giving`,
|
||||
value: `${receiveCardNumber}: ${receiveCardName}`,
|
||||
name: "You Receive",
|
||||
value: `${giveCardNumber}: ${giveCardName}`,
|
||||
inline: true,
|
||||
},
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue