mirror of
https://github.com/ChomeNS/chomens-bot-mc.git
synced 2024-11-14 10:44:55 -05:00
fix the extremely sus invalid timezone ploblem
This commit is contained in:
parent
952335fdb4
commit
91ce3d41ae
1 changed files with 18 additions and 22 deletions
|
@ -8,29 +8,26 @@ module.exports = {
|
||||||
trusted: 0,
|
trusted: 0,
|
||||||
execute (bot, username, sender, prefix, args, config, hash, ownerhash, selector) {
|
execute (bot, username, sender, prefix, args, config, hash, ownerhash, selector) {
|
||||||
const timezone = args.join(' ')
|
const timezone = args.join(' ')
|
||||||
|
|
||||||
|
if (!moment.tz.names().map((zone) => zone.toLowerCase()).includes(timezone.toLowerCase())) {
|
||||||
|
throw new SyntaxError('Invalid timezone')
|
||||||
|
}
|
||||||
|
|
||||||
const momented = moment().tz(timezone).format('dddd, MMMM Do, YYYY, hh:mm:ss A')
|
const momented = moment().tz(timezone).format('dddd, MMMM Do, YYYY, hh:mm:ss A')
|
||||||
const component = [{ text: 'The current date and time for the timezone ', color: 'white' }, { text: timezone, color: 'aqua' }, { text: ' is: ', color: 'white' }, { text: momented, color: 'green' }]
|
const component = [{ text: 'The current date and time for the timezone ', color: 'white' }, { text: timezone, color: 'aqua' }, { text: ' is: ', color: 'white' }, { text: momented, color: 'green' }]
|
||||||
if (timezone.toLowerCase() === 'asia/bangkok' || timezone.toLowerCase() === 'utc' || timezone.toLowerCase() === 'america/new_york') {
|
|
||||||
bot.tellraw(selector, component)
|
bot.tellraw(selector, component)
|
||||||
} else if (momented === moment().format('dddd, MMMM Do, YYYY, hh:mm:ss A')) {
|
|
||||||
throw new SyntaxError('Invalid timezone')
|
|
||||||
} else {
|
|
||||||
bot.tellraw(selector, component)
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
discordExecute (bot, username, sender, prefix, args, channeldc, message, config) {
|
discordExecute (bot, username, sender, prefix, args, channeldc, message, config) {
|
||||||
const timezone = args.join(' ')
|
const timezone = args.join(' ')
|
||||||
|
|
||||||
|
if (!moment.tz.names().map((zone) => zone.toLowerCase()).includes(timezone.toLowerCase())) {
|
||||||
|
throw new SyntaxError('Invalid timezone')
|
||||||
|
}
|
||||||
|
|
||||||
const momented = moment().tz(timezone).format('dddd, MMMM Do, YYYY, hh:mm:ss A')
|
const momented = moment().tz(timezone).format('dddd, MMMM Do, YYYY, hh:mm:ss A')
|
||||||
const description = `The current date and time for the timezone ${timezone} is: ${momented}`
|
const description = `The current date and time for the timezone ${timezone} is: ${momented}`
|
||||||
if (timezone.toLowerCase() === 'asia/bangkok' || timezone.toLowerCase() === 'utc' || timezone.toLowerCase() === 'america/new_york') {
|
|
||||||
const Embed = new EmbedBuilder()
|
|
||||||
.setColor(config.discord.embedsColors.normal)
|
|
||||||
.setTitle('Time')
|
|
||||||
.setDescription(description)
|
|
||||||
channeldc.send({ embeds: [Embed] })
|
|
||||||
} else if (momented === moment().format('dddd, MMMM Do, YYYY, hh:mm:ss A')) {
|
|
||||||
throw new SyntaxError('Invalid timezone')
|
|
||||||
} else {
|
|
||||||
const Embed = new EmbedBuilder()
|
const Embed = new EmbedBuilder()
|
||||||
.setColor(config.discord.embedsColors.normal)
|
.setColor(config.discord.embedsColors.normal)
|
||||||
.setTitle('Time')
|
.setTitle('Time')
|
||||||
|
@ -38,4 +35,3 @@ module.exports = {
|
||||||
channeldc.send({ embeds: [Embed] })
|
channeldc.send({ embeds: [Embed] })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in a new issue