Minz/toho-miku
1
0
Fork 0
Code Issues 33 Pull Requests 8 Actions Packages Projects Releases Wiki Activity

Drop: Make cards claimable by other users

Browse Source 
Cards couldn't be claimed by users other than the dropper because we
were using the wrong user and permissionlevel object from the upper scrope
Fixes #12
This commit is contained in:
Jan Groß
2022-09-08 13:24:19 +02:00
parent d8fb5d0a62
commit 6ce583c8fb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
commands/drop.js
View File

@@ -12,7 +12,7 @@ module.exports = {
async execute(interaction) { async execute(interaction) {
const user = await UserUtils.getUserByDiscordId(interaction.member.id); const user = await UserUtils.getUserByDiscordId(interaction.member.id);
const permissionLevel = await UserUtils.getPermissionLevel(interaction.member); let permissionLevel = await UserUtils.getPermissionLevel(interaction.member);
const cooldowns = await UserUtils.getCooldowns(user); const cooldowns = await UserUtils.getCooldowns(user);
if (cooldowns.dropCooldown > 0 && permissionLevel < 2) { if (cooldowns.dropCooldown > 0 && permissionLevel < 2) {
interaction.reply({ interaction.reply({
@@ -70,7 +70,6 @@ module.exports = {
//set users drop cooldown //set users drop cooldown
await UserUtils.setCooldown(user, "drop", await GeneralUtils.getBotProperty("dropTimeout")); await UserUtils.setCooldown(user, "drop", await GeneralUtils.getBotProperty("dropTimeout"));
const filter = m => m.author.id === interaction.user.id;
const collector = message.createMessageComponentCollector({ componentType: ComponentType.Button, time: 25000 }); const collector = message.createMessageComponentCollector({ componentType: ComponentType.Button, time: 25000 });
let collectionReplies = []; let collectionReplies = [];
@@ -79,7 +78,8 @@ module.exports = {
if (await cards[cardId].userId) { i.reply({ content: "This card has already been claimed!", ephemeral: true }); return; } if (await cards[cardId].userId) { i.reply({ content: "This card has already been claimed!", ephemeral: true }); return; }
let claimUser = await UserUtils.getUserByDiscordId(i.user.id); let claimUser = await UserUtils.getUserByDiscordId(i.user.id);
const cooldowns = await UserUtils.getCooldowns(user); let cooldowns = await UserUtils.getCooldowns(claimUser);
let permissionLevel = await UserUtils.getPermissionLevel(i.member);
if (cooldowns.pullCooldown > 0 && permissionLevel < 2) { if (cooldowns.pullCooldown > 0 && permissionLevel < 2) {
i.reply({ i.reply({
content: `You can claim more cards in ${Math.floor((cooldowns.pullCooldown % 3600000) / 60000)} minutes`, content: `You can claim more cards in ${Math.floor((cooldowns.pullCooldown % 3600000) / 60000)} minutes`,
@@ -91,7 +91,7 @@ module.exports = {
if (claimUser) { if (claimUser) {
//Update card with the user id //Update card with the user id
cards[cardId].userId = claimUser.id; cards[cardId].userId = claimUser.id;
await UserUtils.setCooldown(user, "pull", await GeneralUtils.getBotProperty("pullTimeout")); await UserUtils.setCooldown(claimUser, "pull", await GeneralUtils.getBotProperty("pullTimeout"));
await cards[cardId].save(); await cards[cardId].save();
//fetch character name from database given the character id //fetch character name from database given the character id