diff --git a/commands/misc/timer.js b/commands/misc/timer.js index ddbe9eb..4cc6282 100644 --- a/commands/misc/timer.js +++ b/commands/misc/timer.js @@ -38,7 +38,7 @@ module.exports = { sendText = "Please specify a time, and a message to send after the timer has finished"; break; } - if(!isNaN(parseTime(args[0], Math.floor(new Date() / 1000)) || !isNaN(args[0]))) + if(!isNaN(parseTime(args[0], Math.floor(new Date() / 1000)))) sendText = await createTimer(message, args); break; } diff --git a/server.js b/server.js index c82911c..b38abe4 100644 --- a/server.js +++ b/server.js @@ -48,7 +48,6 @@ client.whitelist = { guild: new Collection(), user: new Collection() } -process.env.TZ = "UTC"; createAndLoadWhitelistTable(client.whitelist); diff --git a/util/timer/createTimer.js b/util/timer/createTimer.js index dbe8e47..28e1c6e 100644 --- a/util/timer/createTimer.js +++ b/util/timer/createTimer.js @@ -4,20 +4,20 @@ const sqlite3 = require('sqlite3').verbose(); module.exports = async function (message, args) { const databasePath = 'data/database.db' if (args.length < 2) - return "Please specify a time, and a message to send after the timer has finished"; + return message.channel.send("Please specify a time, and a message to send after the timer has finished"); let currentUnixTime = Math.floor(new Date() / 1000); let timeInSeconds; - if(!isNaN(Date.parse(args[0])) && isNaN(parseTime(args[0], currentUnixTime))){ + if(!isNaN(Date.parse(args[0])) && isNaN(parseTime(args[0]))){ timeInSeconds = timeUntil(args[0]).totalInSeconds; if(timeInSeconds < 0){ - return "The date must not be in the past." + return message.channel.send("The date must not be in the past."); } }else { timeInSeconds = parseTime(args[0], currentUnixTime); } if (isNaN(timeInSeconds)) { - return "Please specify a time, and a message to send after the timer has finished" + return message.channel.send("Please specify a time, and a message to send after the timer has finished") } let customMessage = args.slice(1).join(" ") let reminderTime = currentUnixTime + timeInSeconds