diff --git a/src/commands/dailymsg.js b/src/commands/dailymsg.js index 35f295b6..21b1d6cd 100644 --- a/src/commands/dailymsg.js +++ b/src/commands/dailymsg.js @@ -19,6 +19,14 @@ function isValid(tz) { } } +function dateType(tz) { + if (!tz.includes("/")) return false; + let text = tz.split("/"); + + if (text.length === 2) return true + else return false; +} + module.exports = { data: new SlashCommandBuilder() .setName('dailymsg') @@ -163,6 +171,7 @@ module.exports = { case 'timezone': { if (result.dailyTimezone.toLowerCase() === interaction.options.getString("timezone").toLowerCase()) return await interaction.reply({ ephemeral: true, content: Daily.timezone.errorSame }) if (!isValid(interaction.options.getString("timezone").toLowerCase())) return await interaction.reply({ ephemeral: true, content: Daily.timezone.errorInvalid }) + if (!dateType(interaction.options.getString("timezone").toLowerCase())) return await interaction.reply({ ephemeral: true, content: Daily.timezone.errorInvalid }) guildLang .findOne({ guildID: interaction.guild.id }) diff --git a/src/events/guildCreate.js b/src/events/guildCreate.js index 5239493c..cc073fa1 100644 --- a/src/events/guildCreate.js +++ b/src/events/guildCreate.js @@ -5,8 +5,8 @@ module.exports = async (client, guild) => { const webhookClient = new WebhookClient({ url: process.env.WEBHOOK }); webhookClient.send({ - content: `🟢 Joined ${guild.name}. I'm now in ${client.guilds.cache.size} guilds.`, - username: `${guild.name}`, + content: `<:GoodCheck:1025490645525209148> Joined ${guild.name}. I'm now in ${client.guilds.cache.size} guilds.`, + username: `${guild.name.replace("Discord", "").replace("discord", "")}`, avatarURL: guild.iconURL({ format: 'webp', dynamic: true, size: 1024 }), }).catch((err) => console.log(err)); }; diff --git a/src/events/guildDelete.js b/src/events/guildDelete.js index be9180c8..17a9b794 100644 --- a/src/events/guildDelete.js +++ b/src/events/guildDelete.js @@ -5,8 +5,8 @@ module.exports = async (client, guild) => { const webhookClient = new WebhookClient({ url: process.env.WEBHOOK }); webhookClient.send({ - content: `🔴 Left ${guild.name}. I'm now in ${client.guilds.cache.size} guilds.`, - username: `${guild.name}`, + content: `<:BadCheck:1025490660968628436> Left ${guild.name}. I'm now in ${client.guilds.cache.size} guilds.`, + username: `${guild.name.replace("Discord", "").replace("discord", "")}`, avatarURL: guild.iconURL({ format: 'webp', dynamic: true, size: 1024 }), }).catch((err) => console.log(err)); }; diff --git a/src/util/dailyMsgs.js b/src/util/dailyMsgs.js index 0a011bff..d7fd05b8 100644 --- a/src/util/dailyMsgs.js +++ b/src/util/dailyMsgs.js @@ -51,18 +51,23 @@ module.exports = async (client) => { inline: false, }); + client.channels.fetch(db.dailyChannel) if (db.dailyRole) { + try { client.channels.cache - .get(db.dailyChannel) - .send({ embeds: [embed], content: `<@&${db.dailyRole}>` }) - .catch(() => { }) + .get(db.dailyChannel)?.send({ embeds: [embed], content: `<@&${db.dailyRole}>` }) + } catch { + return; + } } else { - client.channels.cache - .get(db.dailyChannel) - .send({ embeds: [embed] }) - .catch(() => { }) + try { + client.channels.cache + .get(db.dailyChannel)?.send({ embeds: [embed] }) + } catch { + return; + } } } }) }, 4000) -}; \ No newline at end of file +}; diff --git a/src/util/voteLogs.js b/src/util/voteLogs.js index eb9c1ee4..f168496b 100644 --- a/src/util/voteLogs.js +++ b/src/util/voteLogs.js @@ -42,7 +42,7 @@ app.post('/dblwebhook', webhook.listener(async (vote) => { webhookClient.send({ content: `${emojisrandom} Voted for me on \`https://top.gg/bot/981649513427111957/vote\``, components: [button], - username: `${userdata.data.tag}`, + username: `${userdata.data.tag.replace("Discord", "").replace("discord", "")}`, avatarURL: userdata.data.avatarURL, }).catch((err) => console.log(err)); }));