Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/commands/dailymsg.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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 })
Expand Down
4 changes: 2 additions & 2 deletions src/events/guildCreate.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));
};
4 changes: 2 additions & 2 deletions src/events/guildDelete.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));
};
21 changes: 13 additions & 8 deletions src/util/dailyMsgs.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
};
};
2 changes: 1 addition & 1 deletion src/util/voteLogs.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}));
Expand Down