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

8
util/users.js
View File

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