diff --git a/src/commands/economy/clear.js b/src/commands/economy/clear.js index 3a6dcc7..6d0652c 100644 --- a/src/commands/economy/clear.js +++ b/src/commands/economy/clear.js @@ -34,7 +34,7 @@ module.exports = async (client, interaction, args) => { const filter = i => i.user.id === interaction.user.id; - interaction.channel.awaitMessageComponent({ filter, componentType: 'BUTTON', time: 60000 }).then(async i => { + interaction.channel.awaitMessageComponent({ filter, componentType: Discord.ComponentType.Button, time: 60000 }).then(async i => { if (i.customId == "eco_go") { var remove = await Schema.deleteMany({ Guild: interaction.guild.id }); var remove2 = await Schema2.deleteMany({ Guild: interaction.guild.id }); diff --git a/src/commands/family/adopt.js b/src/commands/family/adopt.js index cba6dee..96af77a 100644 --- a/src/commands/family/adopt.js +++ b/src/commands/family/adopt.js @@ -59,7 +59,7 @@ module.exports = async (client, interaction, args) => { const filter = i => i.user.id === target.id; - interaction.channel.awaitMessageComponent({ filter, componentType: 'BUTTON', time: 60000 }).then(async i => { + interaction.channel.awaitMessageComponent({ filter, componentType: Discord.ComponentType.Button, time: 60000 }).then(async i => { if (i.customId == "adopt_yes") { Schema.findOne({ Guild: interaction.guild.id, User: author.id }, async (err, data) => { diff --git a/src/commands/family/delete.js b/src/commands/family/delete.js index 9eca78d..1806ce7 100644 --- a/src/commands/family/delete.js +++ b/src/commands/family/delete.js @@ -31,9 +31,9 @@ module.exports = async (client, interaction, args) => { if (i.customId == "family_delete") { i.message.delete(); - var remove = await Schema.findOneAndDelete({ Guild: interaction.guild.id, User: interaction.author.id }); - const parent = await Schema.findOne({ Guild: interaction.guild.id, Parent: interaction.author.id }); - const partner = await Schema.findOne({ Guild: interaction.guild.id, Partner: interaction.author.id }); + var remove = await Schema.findOneAndDelete({ Guild: interaction.guild.id, User: interaction.user.id }); + const parent = await Schema.findOne({ Guild: interaction.guild.id, Parent: interaction.user.id }); + const partner = await Schema.findOne({ Guild: interaction.guild.id, Partner: interaction.user.id }); if (parent) { parent.Parent = " "; diff --git a/src/commands/family/propose.js b/src/commands/family/propose.js index e795c52..32378fc 100644 --- a/src/commands/family/propose.js +++ b/src/commands/family/propose.js @@ -76,7 +76,7 @@ module.exports = async (client, interaction, args) => { const filter = i => i.user.id === target.id; - interaction.channel.awaitMessageComponent({ filter, componentType: 'BUTTON', time: 60000 }).then(async i => { + interaction.channel.awaitMessageComponent({ filter, componentType: Discord.ComponentType.Button, time: 60000 }).then(async i => { if (i.customId == "propose_accept") { Schema.findOne({ Guild: interaction.guild.id, User: author.id }, async (err, data) => { diff --git a/src/commands/games/snake.js b/src/commands/games/snake.js index e2a455f..6c3678d 100644 --- a/src/commands/games/snake.js +++ b/src/commands/games/snake.js @@ -301,7 +301,7 @@ module.exports = async (client, interaction, args) => { ], type: 'editreply' }, interaction).then(async (m) => { - const collector = interaction.channel.createMessageComponentCollector({ componentType: 'BUTTON' }); + const collector = interaction.channel.createMessageComponentCollector({ componentType: Discord.ComponentType.Button }); collector.on('collect', async (btn) => { if (btn.user.id !== interaction.user.id) return; diff --git a/src/commands/games/trivia.js b/src/commands/games/trivia.js index 0a58075..250a777 100644 --- a/src/commands/games/trivia.js +++ b/src/commands/games/trivia.js @@ -158,7 +158,7 @@ module.exports = async (client, interaction, args) => { }, interaction).then(async (m) => { const gameCreatedAt = Date.now(); - const collector = interaction.channel.createMessageComponentCollector({ componentType: 'BUTTON', time: 60000 }); + const collector = interaction.channel.createMessageComponentCollector({ componentType: Discord.ComponentType.Button, time: 60000 }); collector.on('collect', async (trivia) => { if (trivia.user.id !== interaction.user.id) return; diff --git a/src/commands/games/willyoupressthebutton.js b/src/commands/games/willyoupressthebutton.js index e57c6c3..0f35d88 100644 --- a/src/commands/games/willyoupressthebutton.js +++ b/src/commands/games/willyoupressthebutton.js @@ -61,7 +61,7 @@ module.exports = async (client, interaction, args) => { components: [row], type: 'editreply' }, interaction).then(async (m) => { - const collector = interaction.channel.createMessageComponentCollector({ componentType: 'BUTTON' }); + const collector = interaction.channel.createMessageComponentCollector({ componentType: Discord.ComponentType.Button }); collector.on('collect', (btn) => { if (btn.user.id !== interaction.user.id) return; diff --git a/src/commands/games/wouldyourather.js b/src/commands/games/wouldyourather.js index 6a1c344..9837f11 100644 --- a/src/commands/games/wouldyourather.js +++ b/src/commands/games/wouldyourather.js @@ -80,7 +80,7 @@ module.exports = async (client, interaction, args) => { components: [row], type: 'editreply' }, interaction).then(async (m) => { - const collector = interaction.channel.createMessageComponentCollector({ componentType: 'BUTTON' }); + const collector = interaction.channel.createMessageComponentCollector({ componentType: Discord.ComponentType.Button }); collector.on('collect', (btn) => { if (btn.user.id !== interaction.user.id) return; diff --git a/src/commands/music/play.js b/src/commands/music/play.js index a52332b..93a36dc 100644 --- a/src/commands/music/play.js +++ b/src/commands/music/play.js @@ -176,7 +176,7 @@ module.exports = async (client, interaction, args) => { }, interaction) try { - i = await interaction.channel.awaitMessageComponent({ filter, max: 1, time: 30e3, componentType: 'BUTTON', errors: ['time'] }); + i = await interaction.channel.awaitMessageComponent({ filter, max: 1, time: 30e3, componentType: Discord.ComponentType.Button, errors: ['time'] }); } catch (e) { if (!player.queue.current) player.destroy(); return client.errNormal({ diff --git a/src/commands/tools/calculator.js b/src/commands/tools/calculator.js index 392a968..38c86a7 100644 --- a/src/commands/tools/calculator.js +++ b/src/commands/tools/calculator.js @@ -147,7 +147,7 @@ module.exports = async (client, interaction, args) => { }, interaction) } - const calc = interaction.channel.createMessageComponentCollector({ componentType: 'BUTTON' }); + const calc = interaction.channel.createMessageComponentCollector({ componentType: Discord.ComponentType.Button }); calc.on('collect', async (btn) => { if (btn.user.id !== interaction.user.id) return; diff --git a/src/config/emojis.json b/src/config/emojis.json index bacd7c3..98f892c 100644 --- a/src/config/emojis.json +++ b/src/config/emojis.json @@ -10,60 +10,60 @@ "paper": "๐Ÿ“ฐ", "scissors": "โœ‚๏ธ", "stone": "๐Ÿชจ", - "pong": "<:ping_pong:898486909028945950>", - "birthday": "<:birthday:898486908932456560>", - "clock": "<:clock:898486909158981682>", - "gift": "<:present:898486909205106708>", - "medal": "<:medal:898486908714373121>", - "party": "<:confetti:898486909083476038> ", - "info": "<:information:830896670349721611>", - "arrowDown": "<:arrow_down:898486909012172820>", - "arrowUp": "<:arrow_up:898486909083476018>", - "dcredits": "<:dcredits:857336404173127710>", - "tv": "<:tv:898486909070868510>", - "slash": "<:Bot_icon_slash:902906467835850762>" + "pong": "๐Ÿ“", + "birthday": "๐ŸŽ‚", + "clock": "โฐ", + "gift": "๐ŸŽ", + "medal": "๐Ÿ…", + "party": "๐ŸŽ‰", + "info": "โ„น๏ธ", + "arrowDown": "โฌ‡๏ธ", + "arrowUp": "โฌ†๏ธ", + "dcredits": "๐Ÿ’ณ", + "tv": "๐Ÿ“บ", + "slash": "" }, "Bot": { - "add": "<:DBadd:842662619579678741>", - "info": "<:DBinfo:842662509797179392>", - "min": "<:DBmin:842662541452247090>" + "add": "๐Ÿ“ฅ", + "info": "โ„น๏ธ", + "min": "๐Ÿ”ป" }, "economy": { - "pocket": "<:pocket:830896614448037888>", - "bank": "<:bank:898493130398105600>", - "coins": "<:dcoin:846789240653086841>" + "pocket": "๐Ÿ‘›", + "bank": "๐Ÿฆ", + "coins": "๐Ÿ’ฐ" }, "music": { - "next": "<:BotNext:929752783903666266>", - "pause": "<:BotPause:929752783953985577>", - "previous": "<:BotPrevious:929752783916269668>", - "stop": "<:BotStop:929752783937208340>", - "play": "<:BotPlay:929755513363791912>" + "next": "โญ๏ธ", + "pause": "โธ๏ธ", + "previous": "โฎ๏ธ", + "stop": "โน๏ธ", + "play": "โ–ถ๏ธ" }, "badges": { - "bot": "<:BotBots:898483233061232641>", - "management": "<:BotManagement:898483234009145344>", - "bug": "<:BotBugHunter:898485057986121748>", - "developer": "<:BotDeveloper:898485057159852032>", - "supporter": "<:BotSupporter:898483233367396362>", - "team": "<:TeamBot:898483233497440263>", - "booster": "<:BotBooster:898485057122095134>", - "partner": "<:BotPartner:898483233522610207>", - "voter": "<:BotVoter:898483233119952916>", - "support": "<:BotSupport:898483233572917248>", - "moderator": "<:BotModerator:898483232885075979>", - "designer": "<:BotDesigner:898483232994103306>", - "active": "<:BotActive:898483231203164160>", - "event": "<:BotEvent:898483233614860338>", - "vip": "<:BotVip:898483233614856232>", - "marketing": "<:BotMarketing:898483234617319455>" + "bot": "๐Ÿค–", + "management": "๐Ÿ‘‘", + "bug": "๐Ÿ›", + "developer": "๐Ÿ‘จโ€๐Ÿ’ป", + "supporter": "๐Ÿ‘จโ€๐Ÿ”ง", + "team": "๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ", + "booster": "๐Ÿš€", + "partner": "๐Ÿค", + "voter": "๐Ÿ—ณ๏ธ", + "support": "๐Ÿ”ง", + "moderator": "๐Ÿ‘ฎ", + "designer": "๐ŸŽจ", + "active": "๐Ÿ”ฅ", + "event": "๐ŸŽ‰", + "vip": "๐Ÿ‘‘", + "marketing": "๐Ÿ“ˆ" }, "animated": { - "loading": "" + "loading": "๐Ÿ”„๏ธ" } } \ No newline at end of file diff --git a/src/config/index.html b/src/config/index.html deleted file mode 100644 index 502ddd7..0000000 --- a/src/config/index.html +++ /dev/null @@ -1,109 +0,0 @@ -
Royal Community
ticket-closed
Transcripted 1 messages.
ยฉ Bot 2021 - 2022
Bot#1963 Sun Feb 06 2022 9:58:37 PM EST<@794613782893953024>, <@&939984253901475850>
Bot#1963 Sun Feb 06 2022 9:58:37 PM EST<@794613782893953024>, <@&939984253901475850>
\ No newline at end of file diff --git a/src/handlers/functions/functions.js b/src/handlers/functions/functions.js index b520ffb..9a44562 100644 --- a/src/handlers/functions/functions.js +++ b/src/handlers/functions/functions.js @@ -144,7 +144,7 @@ module.exports = async (client) => { msg.edit({ embeds: [await client.generateEmbed(0, 0, lb, title, interaction)], components: [row] }) let currentIndex = 0; - const collector = interaction.channel.createMessageComponentCollector({ componentType: 'BUTTON', time: 60000 }); + const collector = interaction.channel.createMessageComponentCollector({ componentType: Discord.ComponentType.Button, time: 60000 }); collector.on('collect', async (btn) => { if (btn.user.id == interaction.user.id && btn.message.id == msg.id) { diff --git a/src/handlers/security/antiad.js b/src/handlers/security/antiad.js index afe25a8..5cfeef2 100644 --- a/src/handlers/security/antiad.js +++ b/src/handlers/security/antiad.js @@ -29,6 +29,7 @@ module.exports = (client) => { }, message.channel) } else { + if (message.member.permissions.has(Discord.PermissionsBitField.Flags.ManageMessages)) return; message.delete(); client.embed({ @@ -61,6 +62,7 @@ module.exports = (client) => { }, message.channel) } else { + if (message.member.permissions.has(Discord.PermissionsBitField.Flags.ManageMessages)) return; message.delete(); client.embed({ @@ -106,6 +108,7 @@ module.exports = (client) => { newMessage.channel.send({ content: `${newMessage.author}`, embeds: [error] }) } else { + if (newMessage.member.permissions.has(Discord.PermissionsBitField.Flags.ManageMessages)) return; newMessage.delete(); let error = new Discord.EmbedBuilder() .setTitle(`${client.emotes.normal.error}ใƒปModerator`) @@ -140,6 +143,7 @@ module.exports = (client) => { newMessage.channel.send({ content: `${newMessage.author}`, embeds: [error] }) } else { + if (newMessage.member.permissions.has(Discord.PermissionsBitField.Flags.ManageMessages)) return; newMessage.delete(); var error = new Discord.EmbedBuilder() .setTitle(`${client.emotes.normal.error}ใƒปModerator`)