Updated emojis and fixed family

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 });

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) => {

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 });
+                var remove = await Schema.findOneAndDelete({ Guild: interaction.guild.id, User: interaction.user.id });
-                const parent = await Schema.findOne({ Guild: interaction.guild.id, Parent: interaction.author.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.author.id });
+                const partner = await Schema.findOne({ Guild: interaction.guild.id, Partner: interaction.user.id });
 
                 if (parent) {
                     parent.Parent = " ";

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) => {

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;

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;

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;

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;

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({

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;

src/config/emojis.json

@@ -10,60 +10,60 @@
         "paper": "📰",
         "scissors": "✂️",
         "stone": "🪨",
-        "pong": "<:ping_pong:898486909028945950>",
+        "pong": "🏓",
-        "birthday": "<:birthday:898486908932456560>",
+        "birthday": "🎂",
-        "clock": "<:clock:898486909158981682>",
+        "clock": "⏰",
-        "gift": "<:present:898486909205106708>",
+        "gift": "🎁",
-        "medal": "<:medal:898486908714373121>",
+        "medal": "🏅",
-        "party": "<:confetti:898486909083476038> ",
+        "party": "🎉",
-        "info": "<:information:830896670349721611>",
+        "info": "ℹ️",
-        "arrowDown": "<:arrow_down:898486909012172820>",
+        "arrowDown": "⬇️",
-        "arrowUp": "<:arrow_up:898486909083476018>",
+        "arrowUp": "⬆️",
-        "dcredits": "<:dcredits:857336404173127710>",
+        "dcredits": "💳",
-        "tv": "<:tv:898486909070868510>",
+        "tv": "📺",
-        "slash": "<:Bot_icon_slash:902906467835850762>"
+        "slash": ""
     },
 
     "Bot": {
-        "add": "<:DBadd:842662619579678741>",
+        "add": "📥",
-        "info": "<:DBinfo:842662509797179392>",
+        "info": "ℹ️",
-        "min": "<:DBmin:842662541452247090>"
+        "min": "🔻"
     },
 
     "economy": {
-        "pocket": "<:pocket:830896614448037888>",
+        "pocket": "👛",
-        "bank": "<:bank:898493130398105600>",
+        "bank": "🏦",
-        "coins": "<:dcoin:846789240653086841>"
+        "coins": "💰"
     },
 
     "music": {
-        "next": "<:BotNext:929752783903666266>",
+        "next": "⏭️",
-        "pause": "<:BotPause:929752783953985577>",
+        "pause": "⏸️",
-        "previous": "<:BotPrevious:929752783916269668>",
+        "previous": "⏮️",
-        "stop": "<:BotStop:929752783937208340>",
+        "stop": "⏹️",
-        "play": "<:BotPlay:929755513363791912>"
+        "play": "▶️"
     },
 
     "badges": {
-        "bot": "<:BotBots:898483233061232641>",
+        "bot": "🤖",
-        "management": "<:BotManagement:898483234009145344>",
+        "management": "👑",
-        "bug": "<:BotBugHunter:898485057986121748>",
+        "bug": "🐛",
-        "developer": "<:BotDeveloper:898485057159852032>",
+        "developer": "👨‍💻",	
-        "supporter": "<:BotSupporter:898483233367396362>",
+        "supporter": "👨‍🔧",
-        "team": "<:TeamBot:898483233497440263>",
+        "team": "👨‍👩‍👧‍👦",
-        "booster": "<:BotBooster:898485057122095134>",
+        "booster": "🚀",
-        "partner": "<:BotPartner:898483233522610207>",
+        "partner": "🤝",
-        "voter": "<:BotVoter:898483233119952916>",
+        "voter": "🗳️",
-        "support": "<:BotSupport:898483233572917248>",
+        "support": "🔧",
-        "moderator": "<:BotModerator:898483232885075979>",
+        "moderator": "👮",
-        "designer": "<:BotDesigner:898483232994103306>",
+        "designer": "🎨",
-        "active": "<:BotActive:898483231203164160>",
+        "active": "🔥",
-        "event": "<:BotEvent:898483233614860338>",
+        "event": "🎉",
-        "vip": "<:BotVip:898483233614856232>",
+        "vip": "👑",
-        "marketing": "<:BotMarketing:898483234617319455>"
+        "marketing": "📈"
     },
 
     "animated": {
-        "loading": "<a:loading:807539286319693844>"
+        "loading": "🔄️"
     }
 }

src/config/index.html

@@ -1,109 +0,0 @@
-<style>
-    /* raleway-800 - latin */
-    @font-face {
-        font-family: 'Raleway';
-        font-style: normal;
-        font-weight: 800;
-        src: url('../fonts/raleway-v19-latin-800.eot');
-        /* IE9 Compat Modes */
-        src: local(''),
-            url('../fonts/raleway-v19-latin-800.eot?#iefix') format('embedded-opentype'),
-            /* IE6-IE8 */
-            url('../fonts/raleway-v19-latin-800.woff2') format('woff2'),
-            /* Super Modern Browsers */
-            url('../fonts/raleway-v19-latin-800.woff') format('woff'),
-            /* Modern Browsers */
-            url('../fonts/raleway-v19-latin-800.ttf') format('truetype'),
-            /* Safari, Android, iOS */
-            url('../fonts/raleway-v19-latin-800.svg#Raleway') format('svg');
-        /* Legacy iOS */
-    }
-
-    body {
-        background-color: #242529;
-        color: #dcddde;
-        font-family: "Raleway", sans-serif;
-        font-size: 16px;
-        font-weight: 800;
-        margin: 0;
-        padding: 0;
-        background-image: url("https://cdn.discordapp.com/attachments/843487478881976381/878331082347540511/Bot_background_template_blue.png");
-        background-size: cover;
-        background-position: center;
-        background-attachment: fixed;
-    }
-
-    .flex {
-        display: flex;
-        justify-content: space-between;
-    }
-
-    .message-container {
-        display: flex;
-        flex-direction: column;
-        padding-left: 15px;
-    }
-
-    .copyright {
-        position: fixed;
-        left: 0;
-        bottom: 0;
-        width: 100%;
-        background-color: red;
-        color: white;
-        text-align: center;
-    }
-
-    .parent-container {
-        padding: 25px;
-        display: flex;
-        margin: 20px;
-        background-color: #242529;
-        border-radius: 20px;
-    }
-
-    .avatar {
-        border-radius: 50%;
-        height: 50px;
-        width: 50px;
-    }
-
-    .message-container .span_name{
-        color: #5865F2;
-    }
-
-    .info__guild-name {
-        font-size: 1.4em;
-    }
-
-    .info {
-        display: flex;
-        justify-content: space-between;
-        max-width: 100%;
-        padding: 10px;
-        margin: 20px;
-        background-color: #242529;
-        border-radius: 20px;
-        width: 50%;
-    }
-
-    .info__channel-name {
-        font-size: 1.2em;
-    }
-
-    .info__guild-icon {
-        max-width: 88px;
-        max-height: 88px;
-    }
-
-    .info__metadata {
-        flex: 1;
-        margin-left: 50px;
-        justify-self: center;
-        align-self: center;
-    }
-
-    .info__guild-icon-container {
-        flex: 0;
-    }
-</style><div class="flex"><div class="info"><div class="info__guild-icon-container"><img src="https://cdn.discordapp.com/icons/939906955957395526/672d6a538f550a28e8a574874d371eb5.webp" width="150"></div><div class="info__metadata"><div class="info__guild-name">Royal Community</div><div class="info__channel-name">ticket-closed</div><div class="info__channel-message-count">Transcripted 1 messages.</div></div></div><div class="info"><div class="info__metadata"><div class="info__guild-name">© Bot 2021 - 2022</div></div></div></div><div class="parent-container"><div class="avatar-container"><img src="https://cdn.discordapp.com/avatars/798144456528363550/0c8fbe926df42b9650238a3a2eabc5fd.webp" class="avatar"></div><div class="message-container"><span class="span_name">Bot#1963 Sun Feb 06 2022 9:58:37 PM EST</span><span>&lt;@794613782893953024&gt;, &lt;@&amp;939984253901475850&gt;</span></div></div><div class="parent-container"><div class="avatar-container"><img src="https://cdn.discordapp.com/avatars/798144456528363550/0c8fbe926df42b9650238a3a2eabc5fd.webp" class="avatar"></div><div class="message-container"><span class="span_name">Bot#1963 Sun Feb 06 2022 9:58:37 PM EST</span><span>&lt;@794613782893953024&gt;, &lt;@&amp;939984253901475850&gt;</span></div></div>

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) {

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`)