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

Cooldown: Use Discord countdown tags for cooldowns

Browse Source 
Closes #37
This commit is contained in:
Jan Groß
2023-03-13 16:22:07 +01:00
parent a096d288f6
commit 646ef11abd
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
commands/cooldowns.js
View File

@@ -19,13 +19,13 @@ module.exports = {
if (cooldowns.remainingDrops > 0) { if (cooldowns.remainingDrops > 0) {
reply += `Drop: ${cooldowns.remainingDrops} remaining\n`; reply += `Drop: ${cooldowns.remainingDrops} remaining\n`;
} else { } else {
reply += `Drop: Resets in ${cooldowns.nextDropResetFormatted}\n`; reply += `Drop: Reset ${cooldowns.nextDropResetFormatted}\n`;
} }
if (cooldowns.remainingClaims > 0) { if (cooldowns.remainingClaims > 0) {
reply += `Claim: ${cooldowns.remainingClaims} remaining\n`; reply += `Claim: ${cooldowns.remainingClaims} remaining\n`;
} else { } else {
reply += `Claim: Resets in ${cooldowns.nextClaimResetFormatted}\n`; reply += `Claim: Reset ${cooldowns.nextClaimResetFormatted}\n`;
} }
if (cooldowns.nextDaily > 0) { if (cooldowns.nextDaily > 0) {

22
util/users.js
View File

@@ -48,7 +48,6 @@ module.exports = {
//Claims //Claims
reply['nextClaimReset'] = Math.max(user['nextClaimReset'].getTime() - reply['now'], 0); reply['nextClaimReset'] = Math.max(user['nextClaimReset'].getTime() - reply['now'], 0);
reply['nextClaimTStamp'] = user['nextClaimReset'].getTime();
//No remamning claims but reset reached //No remamning claims but reset reached
if (user['remainingClaims'] <= 0 && reply['nextClaimReset'] <= 0) { if (user['remainingClaims'] <= 0 && reply['nextClaimReset'] <= 0) {
@@ -58,7 +57,6 @@ module.exports = {
//Drops //Drops
reply['nextDropReset'] = Math.max(user['nextDropReset'].getTime() - reply['now'], 0); reply['nextDropReset'] = Math.max(user['nextDropReset'].getTime() - reply['now'], 0);
reply['nextDropTStamp'] = user['nextDropReset'].getTime();
//No remamning claims but reset reached //No remamning claims but reset reached
if (user['remainingDrops'] <= 0 && reply['nextDropReset'] <= 0) { if (user['remainingDrops'] <= 0 && reply['nextDropReset'] <= 0) {
user['remainingDrops'] = 1 + (tier ? PATREON.tiers[tier].modifiers.drops : 0); user['remainingDrops'] = 1 + (tier ? PATREON.tiers[tier].modifiers.drops : 0);
@@ -69,25 +67,11 @@ module.exports = {
reply['nextDaily'] = Math.max(user['nextDaily'].getTime() - reply['now'], 0); reply['nextDaily'] = Math.max(user['nextDaily'].getTime() - reply['now'], 0);
reply['nextDailyTStamp'] = user['nextDaily'].getTime(); reply['nextDailyTStamp'] = user['nextDaily'].getTime();
reply[`nextDailyFormatted`] = reply['nextDaily'] > 0 ? `<t:${parseInt(reply['nextDailyTStamp'] / 1000)}>` : `Ready!`; reply[`nextDailyFormatted`] = reply['nextDaily'] > 0 ? `<t:${parseInt(reply['nextDailyTStamp'] / 1000)}:R>` : `Ready!`;
for (key of cooldownKeys) { for (key of cooldownKeys) {
let cooldown = reply[key];
reply[`${key}Timestamp`] = user[key].getTime(); reply[`${key}Timestamp`] = user[key].getTime();
let cooldown = reply[key] reply[`${key}Formatted`] = cooldown > 0 ? `<t:${parseInt(reply[`${key}Timestamp`] / 1000)}:R>` : `Ready!`;
let hours = Math.floor(cooldown / 3600000);
let minutes = Math.floor((cooldown % 3600000) / 60000);
let seconds = Math.floor((cooldown % 60000) / 1000);
if (cooldown > 0) {
reply[`${key}Formatted`] = `${(hours >= 1 ? `${hours} hour${hours > 1 ? 's' : ''} ` : '')}`
if (minutes > 0) {
reply[`${key}Formatted`] += `${minutes} minute${minutes > 1 ? 's' : ''} `;
}
if (seconds > 0) {
reply[`${key}Formatted`] += `${seconds} second${seconds > 1 ? 's' : ''}`;
}
} else {
reply[`${key}Formatted`] = `Ready! `;
}
} }
//Persists any potential resets //Persists any potential resets