Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cancel competitive command #133

Merged
merged 3 commits into from
Jan 21, 2024
Merged

Cancel competitive command #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7c332e
feat (RussianRoulette): allow command owner to cancel it
Vinicius-Marques6 Jan 20, 2024
a9e2d2e
feat (HorseDuel): allow command owner to cancel it
Vinicius-Marques6 Jan 20, 2024
5c8e26e
feat (Fight): allow command owner to cancel it
Vinicius-Marques6 Jan 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/commands/economy/fight.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ module.exports = {
});

const filter = (btInt) => {
return instance.defaultFilter(btInt) && btInt.user.id === challenged.user.id;
return (
instance.defaultFilter(btInt) &&
(btInt.user.id === challenged.user.id || (btInt.user.id === user.id && btInt.customId === 'refuse'))
);
};

const collector = answer.createMessageComponentCollector({
Expand All @@ -91,6 +94,12 @@ module.exports = {
USER: challenged,
}),
});
} else if (collected.first().customId === 'refuse' && collected.first().user.id === user.id) {
interaction.followUp({
content: instance.getMessage(interaction, 'FIGHT_DECLINED', {
USER: member,
}),
});
} else if (collected.first().customId === 'refuse') {
interaction.followUp({
content: instance.getMessage(interaction, 'FIGHT_DECLINED', {
Expand Down
122 changes: 73 additions & 49 deletions src/commands/economy/horseduel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { SlashCommandBuilder } = require('discord.js');
const { SlashCommandBuilder, time } = require('discord.js');
const { specialArg, randint, format, buttons } = require('../../utils/functions.js');

module.exports = {
Expand Down Expand Up @@ -44,6 +44,8 @@ module.exports = {
return;
}

const remainingTime = time(Math.floor(Date.now() / 1000) + 60, 'R');

if (player.falcoins >= bet) {
var pot = bet;
const embed = instance
Expand All @@ -52,7 +54,7 @@ module.exports = {
instance.getMessage(interaction, 'HORSERACE_DESCRIPTION', {
USER: user,
BET: format(pot),
})
}) + remainingTime
)
.addFields({
name: instance.getMessage(interaction, 'PLAYERS'),
Expand All @@ -62,12 +64,14 @@ module.exports = {

var answer = await instance.editReply(interaction, {
embeds: [embed],
components: [buttons(['accept', 'skip'])],
components: [buttons(['accept', 'skip', 'refuse'])],
fetchReply: true,
});

player.falcoins -= bet;

player.save();

var users = [user];
var path = ['- - - - -'];

Expand All @@ -82,7 +86,9 @@ module.exports = {

collector.on('collect', async (i) => {
var collectorUser = await database.player.findOne(i.user.id);
if (i.customId === 'skip' && i.user.id === user.id && users.length > 1) {
if (i.customId === 'refuse' && i.user.id === user.id) {
collector.stop('refuse');
} else if (i.customId === 'skip' && i.user.id === user.id && users.length > 1) {
collector.stop();
} else if (i.customId === 'accept' && collectorUser.falcoins >= bet && !users.includes(i.user)) {
collectorUser.falcoins -= bet;
Expand All @@ -93,73 +99,91 @@ module.exports = {
instance.getMessage(interaction, 'HORSERACE_DESCRIPTION', {
USER: user,
BET: format(pot),
})
}) + remainingTime
);
embed.data.fields[0] = {
name: instance.getMessage(interaction, 'PLAYERS'),
value: `${users.join('\n')}`,
inline: false,
};
}

await i.update({
embeds: [embed],
});
collectorUser.save();
await i.update({
embeds: [embed],
});
collectorUser.save();
}
});

collector.on('end', async () => {
while (true) {
var luck = randint(0, users.length - 1);
path[luck] = path[luck].slice(0, -2);

var frase = '';
for (let i = 0; i < path.length; i++) {
frase += `${users[i]}\n:checkered_flag: ${path[i]}:horse_racing:\n\n`;
collector.on('end', async (collected, reason) => {
if (reason === 'refuse') {
for (const _user of users) {
const userFile = await database.player.findOne(_user.id);
userFile.falcoins += bet;
userFile.save();
}

embed.setDescription(
instance.getMessage(interaction, 'HORSERACE_DESCRIPTION2', {
instance.getMessage(interaction, 'HORSERACE_CANCEL', {
USER: user,
BET: format(pot),
})
);
await interaction.editReply({
embeds: [embed],
components: [],
});
} else {
while (true) {
var luck = randint(0, users.length - 1);
path[luck] = path[luck].slice(0, -2);

var frase = '';
for (let i = 0; i < path.length; i++) {
frase += `${users[i]}\n:checkered_flag: ${path[i]}:horse_racing:\n\n`;
}

embed.setDescription(
instance.getMessage(interaction, 'HORSERACE_DESCRIPTION2', {
BET: format(pot),
})
);

embed.data.fields[0] = {
name: '\u200b',
value: `${frase}`,
inline: false,
};

await instance.editReply(interaction, {
embeds: [embed],
components: [],
});

if (path[luck] === '') {
var winner = users[luck];
break;
}

await new Promise((resolve) => setTimeout(resolve, 250));
}

embed.data.fields[0] = {
name: '\u200b',
value: `${frase}`,
inline: false,
};
const winnerFile = await database.player.findOne(winner.id);
winnerFile.falcoins += pot;
if (users.length > 1) winnerFile.wins++;
embed.setDescription(
instance.getMessage(interaction, 'HORSERACE_DESCRIPTION3', {
BET: format(pot),
USER: winner,
SALDO: format(winnerFile.falcoins),
})
);

await instance.editReply(interaction, {
embeds: [embed],
components: [],
});

if (path[luck] === '') {
var winner = users[luck];
break;
}

await new Promise((resolve) => setTimeout(resolve, 250));
winnerFile.save();
}

const winnerFile = await database.player.findOne(winner.id);
winnerFile.falcoins += pot;
if (users.length > 1) winnerFile.wins++;
embed.setDescription(
instance.getMessage(interaction, 'HORSERACE_DESCRIPTION3', {
BET: format(pot),
USER: winner,
SALDO: format(winnerFile.falcoins),
})
);

await instance.editReply(interaction, {
embeds: [embed],
components: [],
});
player.save();
winnerFile.save();
});
} else {
await instance.editReply(interaction, {
Expand Down
119 changes: 73 additions & 46 deletions src/commands/economy/russianroulette.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const { SlashCommandBuilder } = require('discord.js');
const { SlashCommandBuilder, time } = require('discord.js');
const { specialArg, randint, format, buttons } = require('../../utils/functions.js');
const { log } = require('console');

module.exports = {
data: new SlashCommandBuilder()
Expand Down Expand Up @@ -38,6 +39,9 @@ module.exports = {
}),
});
}

const remainingTime = time(Math.floor(Date.now() / 1000) + 60, 'R');

if (player.falcoins >= bet) {
var pot = bet;
const embed = instance
Expand All @@ -46,7 +50,7 @@ module.exports = {
instance.getMessage(interaction, 'RUSSIANROULETTE_DESCRIPTION', {
USER: user,
BET: format(pot),
})
}) + remainingTime
)
.addFields({
name: instance.getMessage(interaction, 'PLAYERS'),
Expand All @@ -55,11 +59,13 @@ module.exports = {
});
var answer = await instance.editReply(interaction, {
embeds: [embed],
components: [buttons(['accept', 'skip'])],
components: [buttons(['accept', 'skip', 'refuse'])],
fetchReply: true,
});
player.falcoins -= bet;

player.save();

var users = [user];
var names = [user];
mensagens = instance.getMessage(interaction, 'RUSROL');
Expand All @@ -75,7 +81,9 @@ module.exports = {

collector.on('collect', async (i) => {
const collectorUser = await database.player.findOne(i.user.id);
if (i.customId === 'skip' && i.user.id === user.id && users.length > 1) {
if (i.customId === 'refuse' && i.user.id === user.id) {
collector.stop('refuse');
} else if (i.customId === 'skip' && i.user.id === user.id && users.length > 1) {
collector.stop();
} else if (i.customId === 'accept' && collectorUser.falcoins >= bet && !users.includes(i.user)) {
collectorUser.falcoins -= bet;
Expand All @@ -86,67 +94,86 @@ module.exports = {
instance.getMessage(interaction, 'RUSSIANROULETTE_DESCRIPTION', {
USER: user,
BET: format(pot),
})
}) + remainingTime
);
embed.data.fields[0] = {
name: instance.getMessage(interaction, 'PLAYERS'),
value: `${names.join('\n')}`,
inline: false,
};
}

await i.update({
embeds: [embed],
});
collectorUser.save();
await i.update({
embeds: [embed],
});

collectorUser.save();
}
});

collector.on('end', async () => {
while (users.length > 1) {
var luck = randint(0, users.length - 1);
var eliminated = users[luck];
names.splice(
names.findIndex((user) => user === eliminated),
1,
`~~${eliminated}~~ :skull:`
);
users.splice(luck, 1);
collector.on('end', async (collected, reason) => {
if (reason === 'refuse') {
for (user of users) {
const userFile = await database.player.findOne(user.id);
userFile.falcoins += bet;
userFile.save();
}

embed.setDescription(
instance.getMessage(interaction, 'RUSSIANROULETTE_DESCRIPTION2', {
instance.getMessage(interaction, 'RUSSIANROULETTE_CANCEL', {
USER: user,
BET: format(pot),
}) + `\n${eliminated} ${mensagens[randint(0, mensagens.length - 1)]}`
})
);
await interaction.editReply({
embeds: [embed],
components: [],
});
} else {
while (users.length > 1) {
var luck = randint(0, users.length - 1);
var eliminated = users[luck];
names.splice(
names.findIndex((user) => user === eliminated),
1,
`~~${eliminated}~~ :skull:`
);
users.splice(luck, 1);
embed.setDescription(
instance.getMessage(interaction, 'RUSSIANROULETTE_DESCRIPTION2', {
BET: format(pot),
}) + `\n${eliminated} ${mensagens[randint(0, mensagens.length - 1)]}`
);

embed.data.fields[0] = {
name: instance.getMessage(interaction, 'PLAYERS'),
value: `${names.join('\n')}`,
inline: false,
};
embed.data.fields[0] = {
name: instance.getMessage(interaction, 'PLAYERS'),
value: `${names.join('\n')}`,
inline: false,
};

await instance.editReply(interaction, {
embeds: [embed],
components: [],
});
await new Promise((resolve) => setTimeout(resolve, 5000));
}
var winner = users[0];
const winnerFile = await database.player.findOne(winner.id);
winnerFile.falcoins += pot;
if (users.length > 1) winnerFile.wins++;
embed.setDescription(
instance.getMessage(interaction, 'RUSSIANROULETTE_DESCRIPTION3', {
BET: format(pot),
USER: winner,
SALDO: format(winnerFile.falcoins),
})
);

await instance.editReply(interaction, {
embeds: [embed],
components: [],
});
await new Promise((resolve) => setTimeout(resolve, 5000));
winnerFile.save();
}
var winner = users[0];
const winnerFile = await database.player.findOne(winner.id);
winnerFile.falcoins += pot;
if (users.length > 1) winnerFile.wins++;
embed.setDescription(
instance.getMessage(interaction, 'RUSSIANROULETTE_DESCRIPTION3', {
BET: format(pot),
USER: winner,
SALDO: format(winnerFile.falcoins),
})
);

await instance.editReply(interaction, {
embeds: [embed],
components: [],
});
player.save();
winnerFile.save();
});
} else if (bet <= 0) {
await instance.editReply(interaction, {
Expand Down
Loading