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

Drop: Fix cooldown formatting (fixes #15)

Browse Source 
Formatted cooldown strings are now properly pluralized
trimmed for zero values and also include seconds.
This commit is contained in:
Jan Groß
2022-09-21 11:51:58 +02:00
parent f0a0bef7e9
commit 4d97215891
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
commands/drop.js
View File

@@ -18,7 +18,7 @@ module.exports = {
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.editReply({ interaction.editReply({
content: `You can drop more cards in ${Math.floor((cooldowns.dropCooldown % 3600000) / 60000)} minutes`, content: `You can't drop a card yet! ${cooldowns.dropCooldownFormatted}`,
ephemeral: false ephemeral: false
}); });
return; return;
@@ -108,7 +108,7 @@ module.exports = {
let permissionLevel = await UserUtils.getPermissionLevel(i.member); 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't claim a card yet! ${cooldowns.pullCooldownFormatted}`,
ephemeral: false ephemeral: false
}); });
return; return;

8
util/users.js
View File

@@ -48,9 +48,13 @@ module.exports = {
reply[`next${key}Timestamp`] = user[`next${key}`].getTime(); reply[`next${key}Timestamp`] = user[`next${key}`].getTime();
let cooldown = Math.max(reply[`next${key}Timestamp`] - reply['now'], 0); let cooldown = Math.max(reply[`next${key}Timestamp`] - reply['now'], 0);
reply[`${key.toLowerCase()}Cooldown`] = cooldown; reply[`${key.toLowerCase()}Cooldown`] = cooldown;
let hours = Math.floor(cooldown / 3600000);
let minutes = Math.floor((cooldown % 3600000) / 60000);
let seconds = Math.floor((cooldown % 60000) / 1000);
if (cooldown > 0) { if (cooldown > 0) {
reply[`${key.toLowerCase()}CooldownFormatted`] = `Next ${key} in ${Math.floor(cooldown / 3600000)} hours ` + reply[`${key.toLowerCase()}CooldownFormatted`] = `Next ${key} in ` + (hours >= 1 ? `${hours} hour${hours > 1 ? 's' : ''} ` : '') +
`and ${Math.floor((cooldown % 3600000) / 60000)} minutes`; `${minutes} minute${minutes > 1 ? 's' : ''} ` +
`${seconds} second${seconds > 1 ? 's' : ''}`;
} else { } else {
reply[`${key.toLowerCase()}CooldownFormatted`] = `${key} Ready!`; reply[`${key.toLowerCase()}CooldownFormatted`] = `${key} Ready!`;
} }