From 08fdcc0730ba9bf8168da156e8f42a1c502e7a8c Mon Sep 17 00:00:00 2001 From: CorwinDev <88144943+CorwinDev@users.noreply.github.com> Date: Wed, 14 Dec 2022 16:57:55 +0100 Subject: [PATCH] Fixed some errors --- src/bot.js | 2 +- src/handlers/audio/music.js | 2 +- src/handlers/audio/radio.js | 2 +- src/handlers/components/customEvents.js | 8 +++---- src/handlers/functions/inviteTracker.js | 6 ++--- src/handlers/functions/serverstats.js | 27 +++++++++++----------- src/handlers/games/guessNumber.js | 4 ++-- src/handlers/games/guessWord.js | 4 ++-- src/handlers/games/wordsnake.js | 4 ++-- src/handlers/helppanel/changelogs.js | 2 +- src/handlers/helppanel/commands.js | 2 +- src/handlers/helppanel/invite.js | 2 +- src/handlers/helppanel/support.js | 2 +- src/handlers/linkspanel/botInvite.js | 2 +- src/handlers/linkspanel/botInvite2.js | 2 +- src/handlers/linkspanel/communityServer.js | 2 +- src/handlers/linkspanel/supportServer.js | 2 +- src/handlers/linkspanel/topGG.js | 2 +- src/handlers/loaders/event.js | 5 +++- src/handlers/security/antiad.js | 2 +- src/handlers/security/antispam.js | 2 +- src/handlers/security/blacklist.js | 4 ++-- 22 files changed, 47 insertions(+), 43 deletions(-) diff --git a/src/bot.js b/src/bot.js index 3f5a171..9eeac2b 100644 --- a/src/bot.js +++ b/src/bot.js @@ -227,7 +227,7 @@ process.on('warning', warn => { }) }); -client.on('shardError', error => { +client.on(Discord.ShardEvents.Error, error => { const embed = new Discord.EmbedBuilder() .setTitle(`🚨・A websocket connection encountered an error`) .addFields([ diff --git a/src/handlers/audio/music.js b/src/handlers/audio/music.js index 8ec0c1e..1a0d012 100644 --- a/src/handlers/audio/music.js +++ b/src/handlers/audio/music.js @@ -2,7 +2,7 @@ const Discord = require('discord.js'); const Voice = require('@discordjs/voice'); module.exports = (client) => { - client.on('interactionCreate', async (interaction) => { + client.on(Discord.Events.InteractionCreate, async (interaction) => { if (interaction.isButton()) { if (interaction.customId == "Bot-musicpause") { interaction.deferUpdate(); diff --git a/src/handlers/audio/radio.js b/src/handlers/audio/radio.js index e149c4c..c3629e6 100644 --- a/src/handlers/audio/radio.js +++ b/src/handlers/audio/radio.js @@ -73,7 +73,7 @@ module.exports = (client) => { client.startStream(process.env.RADIO || "https://playerservices.streamtheworld.com/api/livestream-redirect/RADIO538"); }); - client.on('ready', async () => { + client.on(Discord.Events.ClientReady, async () => { client.startStream(process.env.RADIO || "https://playerservices.streamtheworld.com/api/livestream-redirect/RADIO538"); Schema.find(async (err, data) => { diff --git a/src/handlers/components/customEvents.js b/src/handlers/components/customEvents.js index b556b9c..c2e6188 100644 --- a/src/handlers/components/customEvents.js +++ b/src/handlers/components/customEvents.js @@ -13,7 +13,7 @@ module.exports = async (client) => { } } - client.on('guildMemberUpdate', (oldMember, newMember) => { + client.on(Discord.Events.GuildMemberUpdate, (oldMember, newMember) => { if (!oldMember.premiumSince && newMember.premiumSince) { client.emit('guildMemberBoost', newMember); } @@ -23,7 +23,7 @@ module.exports = async (client) => { } }) - client.on('guildUpdate', (oldGuild, newGuild) => { + client.on(Discord.Events.GuildUpdate, (oldGuild, newGuild) => { if (oldGuild.premiumTier < newGuild.premiumTier) { client.emit('guildBoostLevelUp', newGuild, oldGuild.premiumTier, newGuild.premiumTier); } @@ -53,7 +53,7 @@ module.exports = async (client) => { } }) - client.on('roleUpdate', (oldRole, newRole) => { + client.on(Discord.Events.RoleUpdate, (oldRole, newRole) => { if (oldRole.rawPosition !== newRole.rawPosition) { client.emit('rolePositionUpdate', newRole, oldRole.rawPosition, newRole.rawPosition); } @@ -71,7 +71,7 @@ module.exports = async (client) => { } }) - client.on('channelUpdate', (oldChannel, newChannel) => { + client.on(Discord.Events.ChannelUpdate, (oldChannel, newChannel) => { if (oldChannel.type === Discord.ChannelType.GuildText && oldChannel.topic !== newChannel.topic) { client.emit('channelTopicUpdate', newChannel, oldChannel.topic, newChannel.topic); } diff --git a/src/handlers/functions/inviteTracker.js b/src/handlers/functions/inviteTracker.js index 580eeec..4bf336b 100644 --- a/src/handlers/functions/inviteTracker.js +++ b/src/handlers/functions/inviteTracker.js @@ -3,7 +3,7 @@ const Discord = require("discord.js"); module.exports = async (client) => { const guildInvites = new Map(); - client.on('inviteCreate', async invite => { + client.on(Discord.Events.InviteCreate, async invite => { try { const invites = await invite.guild.invites.fetch().catch(() => { }); @@ -15,7 +15,7 @@ module.exports = async (client) => { catch { } }) - client.once('ready', async () => { + client.once(Discord.Events.ClientReady, async () => { try { const Guilds = client.guilds.cache.map(guild => guild.id); let i = 0; @@ -37,7 +37,7 @@ module.exports = async (client) => { } catch (e) { } }); - client.on('guildMemberAdd', async member => { + client.on(Discord.Events.GuildMemberAdd, async member => { try { const cachedInvites = guildInvites.get(member.guild.id) const newInvites = await member.guild.invites.fetch().catch(() => { }); diff --git a/src/handlers/functions/serverstats.js b/src/handlers/functions/serverstats.js index a5f8774..eb516e4 100644 --- a/src/handlers/functions/serverstats.js +++ b/src/handlers/functions/serverstats.js @@ -1,4 +1,5 @@ const Schema = require("../../database/models/stats"); +const Discord = require('discord.js'); module.exports = async (client) => { client.getTemplate = async (guild) => { @@ -17,23 +18,23 @@ module.exports = async (client) => { } } - client.on('guildMemberAdd', async (member) => { + client.on(Discord.Events.GuildMemberAdd, async (member) => { client.emit('updateMembers', member.guild); client.emit('updateBots', member.guild); }) - client.on('guildMemberRemove', async (member) => { + client.on(Discord.Events.GuildMemberRemove, async (member) => { client.emit('updateMembers', member.guild); client.emit('updateBots', member.guild); }) - client.on('channelCreate', async channel => { + client.on(Discord.Events.ChannelCreate, async channel => { client.emit('updateChannels', channel, channel.guild); client.emit('updateNewsChannels', channel, channel.guild); client.emit('updateStageChannels', channel, channel.guild); client.emit('updateTextChannels', channel, channel.guild); client.emit('updateVoiceChannels', channel, channel.guild); }) - client.on('channelDelete', async channel => { + client.on(Discord.Events.ChannelDelete, async channel => { client.emit('updateChannels', channel, channel.guild); client.emit('updateNewsChannels', channel, channel.guild); client.emit('updateStageChannels', channel, channel.guild); @@ -41,27 +42,27 @@ module.exports = async (client) => { client.emit('updateVoiceChannels', channel, channel.guild); }) - client.on('roleCreate', async role => client.emit('updateRoles', role.guild)) - client.on('roleDelete', async role => client.emit('updateRoles', role.guild)) + client.on(Discord.Events.RoleCreate, async role => client.emit('updateRoles', role.guild)) + client.on(Discord.Events.RoleDelete, async role => client.emit('updateRoles', role.guild)) - client.on('guildMemberBoost', (booster) => client.emit('updateBoosts', booster.guild)) - client.on('guildMemberUnboost', (booster) => client.emit('updateBoosts', booster.guild)) + client.on(Discord.Events.GuildMemberBoost, (booster) => client.emit('updateBoosts', booster.guild)) + client.on(Discord.Events.GuildMemberUnboost, (booster) => client.emit('updateBoosts', booster.guild)) - client.on('guildBoostLevelUp', (tier) => client.emit('updateTier', tier.guild)) - client.on('guildBoostLevelDown', (tier) => client.emit('updateTier', tier.guild)) + client.on(Discord.Events.GuildBoostLevelUp, (tier) => client.emit('updateTier', tier.guild)) + client.on(Discord.Events.GuildBoostLevelDown, (tier) => client.emit('updateTier', tier.guild)) - client.on('emojiCreate', (emoji) => { + client.on(Discord.Events.EmojiCreate, (emoji) => { client.emit('updateEmojis', emoji, emoji.guild); client.emit('updateAEmojis', emoji, emoji.guild); client.emit('updateSEmojis', emoji, emoji.guild); }) - client.on('emojiDelete', (emoji) => { + client.on(Discord.Events.EmojiDelete, (emoji) => { client.emit('updateEmojis', emoji, emoji.guild); client.emit('updateAEmojis', emoji, emoji.guild); client.emit('updateSEmojis', emoji, emoji.guild); }) - client.on('ready', async client => client.emit('updateClock')) + client.on(Discord.Events.ClientReady, async client => client.emit('updateClock')) } \ No newline at end of file diff --git a/src/handlers/games/guessNumber.js b/src/handlers/games/guessNumber.js index 6483274..5cdb96a 100644 --- a/src/handlers/games/guessNumber.js +++ b/src/handlers/games/guessNumber.js @@ -1,9 +1,9 @@ -const discord = require('discord.js'); +const Discord = require('discord.js'); const Schema = require("../../database/models/guessNumber"); module.exports = async (client) => { - client.on('messageCreate', async (message) => { + client.on(Discord.Events.MessageCreate, async (message) => { if (message.author.bot || message.channel.type === 'DM') return; const data = await Schema.findOne({ Guild: message.guild.id, Channel: message.channel.id }) diff --git a/src/handlers/games/guessWord.js b/src/handlers/games/guessWord.js index e6eabe6..a7512a6 100644 --- a/src/handlers/games/guessWord.js +++ b/src/handlers/games/guessWord.js @@ -1,9 +1,9 @@ -const discord = require('discord.js'); +const Discord = require('discord.js'); const Schema = require("../../database/models/guessWord"); module.exports = async (client) => { - client.on('messageCreate', async (message) => { + client.on(Discord.Events.MessageCreate, async (message) => { if (message.author.bot || message.channel.type === 'DM') return; let wordList = client.config.wordList; diff --git a/src/handlers/games/wordsnake.js b/src/handlers/games/wordsnake.js index 21560bf..64495fa 100644 --- a/src/handlers/games/wordsnake.js +++ b/src/handlers/games/wordsnake.js @@ -1,9 +1,9 @@ -const discord = require('discord.js'); +const Discord = require('discord.js'); const Schema = require("../../database/models/wordsnake"); module.exports = async (client) => { - client.on('messageCreate', async (message) => { + client.on(Discord.Events.MessageCreate, async (message) => { if (message.author.bot || message.channel.type === 'DM') return; Schema.findOne({ Guild: message.guild.id, Channel: message.channel.id }, async (err, data) => { diff --git a/src/handlers/helppanel/changelogs.js b/src/handlers/helppanel/changelogs.js index f885f3d..bada67c 100644 --- a/src/handlers/helppanel/changelogs.js +++ b/src/handlers/helppanel/changelogs.js @@ -1,7 +1,7 @@ const Discord = require('discord.js'); module.exports = async (client) => { - client.on('interactionCreate', async (interaction) => { + client.on(Discord.Events.InteractionCreate, async (interaction) => { if (!interaction.isStringSelectMenu()) return; if (interaction.customId == "Bot-helppanel") { diff --git a/src/handlers/helppanel/commands.js b/src/handlers/helppanel/commands.js index 55d836f..cf05c4a 100644 --- a/src/handlers/helppanel/commands.js +++ b/src/handlers/helppanel/commands.js @@ -189,7 +189,7 @@ module.exports = async (client) => { }, ]; - client.on('interactionCreate', async (interaction) => { + client.on(Discord.Events.InteractionCreate, async (interaction) => { if (!interaction.isStringSelectMenu()) return; if (interaction.customId == "Bot-helppanel") { diff --git a/src/handlers/helppanel/invite.js b/src/handlers/helppanel/invite.js index bf8f608..e9de65c 100644 --- a/src/handlers/helppanel/invite.js +++ b/src/handlers/helppanel/invite.js @@ -1,7 +1,7 @@ const Discord = require('discord.js'); module.exports = async (client) => { - client.on('interactionCreate', async (interaction) => { + client.on(Discord.Events.InteractionCreate, async (interaction) => { if (!interaction.isStringSelectMenu()) return; if (interaction.customId == "Bot-helppanel") { diff --git a/src/handlers/helppanel/support.js b/src/handlers/helppanel/support.js index e876101..31d5b31 100644 --- a/src/handlers/helppanel/support.js +++ b/src/handlers/helppanel/support.js @@ -1,7 +1,7 @@ const Discord = require('discord.js'); module.exports = async (client) => { - client.on('interactionCreate', async (interaction) => { + client.on(Discord.Events.InteractionCreate, async (interaction) => { if (!interaction.isStringSelectMenu()) return; if (interaction.customId == "Bot-helppanel") { diff --git a/src/handlers/linkspanel/botInvite.js b/src/handlers/linkspanel/botInvite.js index 00ea640..8b9aa3e 100644 --- a/src/handlers/linkspanel/botInvite.js +++ b/src/handlers/linkspanel/botInvite.js @@ -1,7 +1,7 @@ const Discord = require('discord.js'); module.exports = async (client) => { - client.on('interactionCreate', async (interaction) => { + client.on(Discord.Events.InteractionCreate, async (interaction) => { if (!interaction.isStringSelectMenu()) return; if (interaction.customId == "Bot-linkspanel") { diff --git a/src/handlers/linkspanel/botInvite2.js b/src/handlers/linkspanel/botInvite2.js index e7a3361..0df8422 100644 --- a/src/handlers/linkspanel/botInvite2.js +++ b/src/handlers/linkspanel/botInvite2.js @@ -1,7 +1,7 @@ const Discord = require('discord.js'); module.exports = async (client) => { - client.on('interactionCreate', async (interaction) => { + client.on(Discord.Events.InteractionCreate, async (interaction) => { if (!interaction.isStringSelectMenu()) return; if (interaction.customId == "Bot-linkspanel") { diff --git a/src/handlers/linkspanel/communityServer.js b/src/handlers/linkspanel/communityServer.js index 7ec7407..a9e8f5c 100644 --- a/src/handlers/linkspanel/communityServer.js +++ b/src/handlers/linkspanel/communityServer.js @@ -1,7 +1,7 @@ const Discord = require('discord.js'); module.exports = async (client) => { - client.on('interactionCreate', async (interaction) => { + client.on(Discord.Events.InteractionCreate, async (interaction) => { if (!interaction.isStringSelectMenu()) return; if (interaction.customId == "Bot-linkspanel") { diff --git a/src/handlers/linkspanel/supportServer.js b/src/handlers/linkspanel/supportServer.js index 4d74691..5f3ef4d 100644 --- a/src/handlers/linkspanel/supportServer.js +++ b/src/handlers/linkspanel/supportServer.js @@ -1,7 +1,7 @@ const Discord = require('discord.js'); module.exports = async (client) => { - client.on('interactionCreate', async (interaction) => { + client.on(Discord.Events.InteractionCreate, async (interaction) => { if (!interaction.isStringSelectMenu()) return; if (interaction.customId == "Bot-linkspanel") { diff --git a/src/handlers/linkspanel/topGG.js b/src/handlers/linkspanel/topGG.js index ae1cffc..5eebaf0 100644 --- a/src/handlers/linkspanel/topGG.js +++ b/src/handlers/linkspanel/topGG.js @@ -1,7 +1,7 @@ const Discord = require('discord.js'); module.exports = async (client) => { - client.on('interactionCreate', async (interaction) => { + client.on(Discord.Events.InteractionCreate, async (interaction) => { if (!interaction.isStringSelectMenu()) return; if (interaction.customId == "Bot-linkspanel") { diff --git a/src/handlers/loaders/event.js b/src/handlers/loaders/event.js index 7f39fc6..eaacd70 100644 --- a/src/handlers/loaders/event.js +++ b/src/handlers/loaders/event.js @@ -1,5 +1,6 @@ const chalk = require('chalk'); const fs = require('fs'); +const Discord = require('discord.js'); module.exports = (client) => { @@ -14,7 +15,9 @@ module.exports = (client) => { for (const file of events) { const event = require(`../../events/${dirs}/${file}`); - client.on(file.split(".")[0], event.bind(null, client)).setMaxListeners(0); + const eventName = file.split(".")[0]; + const eventUpperCase = eventName.charAt(0).toUpperCase() + eventName.slice(1); + client.on(Discord.Events[eventUpperCase], event.bind(null, client)); }; }); } diff --git a/src/handlers/security/antiad.js b/src/handlers/security/antiad.js index 5cfeef2..579e9a0 100644 --- a/src/handlers/security/antiad.js +++ b/src/handlers/security/antiad.js @@ -4,7 +4,7 @@ const Schema = require("../../database/models/functions"); const Schema2 = require("../../database/models/channelList"); module.exports = (client) => { - client.on('messageCreate', async (message) => { + client.on(Discord.Events.MessageCreate, async (message) => { if (message.channel.type === 'DM') return; Schema.findOne({ Guild: message.guild.id }, async (err, data) => { if (data) { diff --git a/src/handlers/security/antispam.js b/src/handlers/security/antispam.js index 62bb990..71070a2 100644 --- a/src/handlers/security/antispam.js +++ b/src/handlers/security/antispam.js @@ -8,7 +8,7 @@ const TIME = 10000; const DIFF = 3000; module.exports = async (client) => { - client.on('messageCreate', async (message) => { + client.on(Discord.Events.MessageCreate, async (message) => { if (message.author.bot || message.channel.type === 'DM') return; Schema.findOne({ Guild: message.guild.id }, async (err, data) => { diff --git a/src/handlers/security/blacklist.js b/src/handlers/security/blacklist.js index 61829a7..9145a47 100644 --- a/src/handlers/security/blacklist.js +++ b/src/handlers/security/blacklist.js @@ -4,7 +4,7 @@ const BlackList = require("../../database/models/blacklist"); const { blacklistedWords } = require("../../Collection"); module.exports = async (client) => { - client.on('messageCreate', async (message) => { + client.on(Discord.Events.MessageCreate, async (message) => { if (message.channel.type === 'DM') return; try { @@ -31,7 +31,7 @@ module.exports = async (client) => { catch { } }).setMaxListeners(0); - client.on('messageUpdate', async (oldMessage, newMessage) => { + client.on(Discord.Events.MessageUpdate, async (oldMessage, newMessage) => { if (oldMessage.content === newMessage.content) { return; }