update

.eslintrc.json

@@ -1,8 +1,8 @@
 {
     "env": {
         "commonjs": true,
-        "es6": true,
-        "node": true
+        "node": true,
+        "es6": true
     },
     "extends": "eslint:recommended",
     "globals": {
@@ -48,6 +48,7 @@
                 "after": true
             }
         ],
+        "quote-props": ["error", "as-needed"],
         "require-atomic-updates": 0,
         "no-async-promise-executor": 0
     }

.gitignore

@@ -1,6 +1,7 @@
 # Node
 node_modules/
 package-lock.json
+yarn*.log
 
 # Conf
 config.js

README.md

@@ -15,7 +15,7 @@ We're sorry but we won't be able to help you to install the bot on your own serv
 
 ## 🌐 Dashboard
 
-ManageInvite has a powerful dashboard which allow you to manage your servers easily! Configure join/leave messages, change server prefix, server language, etc...
+ManageInvite has a powerful dashboard which allows you to manage your servers easily! Configure join/leave messages, change server prefix, server language, etc...
 
 <img src="./assets/selector.png" style="margin-right: 2px;width: 40%;" ></img>
 <img src="./assets/manage.png" style="margin-right: 2px;width: 40%;" ></img>

commands/admin/addbonus.js

@@ -14,32 +14,48 @@ module.exports = class extends Command {
 
     async run (message, args, data) {
 
+        const blacklistedUsers = await this.client.database.fetchGuildBlacklistedUsers(message.guild.id);
+
         const bonus = args[0];
         if (!bonus) return message.error("admin/addbonus:MISSING_AMOUNT", {
-            prefix: data.guild.prefix
+            prefix: message.guild.settings.prefix
         });
         if (isNaN(bonus) || (parseInt(bonus) < 1) || !Number.isInteger(parseInt(bonus))) return message.error("admin/addbonus:INVALID_AMOUNT", {
-            prefix: data.guild.prefix
+            prefix: message.guild.settings.prefix
         });
 
         const member = message.mentions.members.first() || await this.client.resolveMember(args.slice(1).join(" "), message.guild);
         if (!member && args[1] !== "all") return message.error("admin/addbonus:MISSING_TARGET", {
-            prefix: data.guild.prefix
+            prefix: message.guild.settings.prefix
         });
         if (member){
-            if (data.guild.blacklistedUsers.includes(member.id)){
+            if (blacklistedUsers.includes(member.id)){
                 return message.error("admin/blacklist:BLACKLISTED", {
                     username: member.user.username
                 });
             }
-            const memberData = await this.client.database.fetchMember(member.id, message.guild.id);
-            memberData.bonus += parseInt(bonus);
-            await memberData.updateInvites();
+            const memberData = await this.client.database.fetchGuildMember({
+                userID: member.user.id,
+                guildID: message.guild.id,
+                storageID: message.guild.settings.storageID
+            });
+            if (memberData.notCreated) await this.client.database.createGuildMember({
+                userID: member.user.id,
+                guildID: message.guild.id,
+                storageID: message.guild.settings.storageID
+            });
+            await this.client.database.addInvites({
+                userID: member.user.id,
+                guildID: message.guild.id,
+                storageID: message.guild.settings.storageID,
+                number: parseInt(bonus),
+                type: "bonus"
+            });
 
             const embed = new Discord.MessageEmbed()
                 .setAuthor(message.translate("admin/addbonus:SUCCESS_TITLE"))
                 .setDescription(message.translate("admin/addbonus:SUCCESS_CONTENT_MEMBER", {
-                    prefix: data.guild.prefix,
+                    prefix: message.guild.settings.prefix,
                     usertag: member.user.tag,
                     username: member.user.username
                 }))
@@ -57,18 +73,17 @@ module.exports = class extends Command {
 
                 await conf.sendT("misc:PLEASE_WAIT", null, true, false, "loading");
                 await message.guild.members.fetch();
-                const members = message.guild.members.cache.map((m) => {
-                    return {
-                        userID: m.id,
-                        guildID: message.guild.id
-                    };
+                await this.client.database.addGuildInvites({
+                    userIDs: message.guild.members.cache.map((m) => m.id),
+                    guildID: message.guild.id,
+                    storageID: message.guild.settings.storageID,
+                    number: parseInt(bonus),
+                    type: "bonus"
                 });
-                await this.client.database.fetchMembers(members);
-                await this.client.database.addBonusInvitesMembers(message.guild.id, bonus);
                 const embed = new Discord.MessageEmbed()
                     .setAuthor(message.translate("admin/addbonus:SUCCESS_TITLE"))
                     .setDescription(message.translate("admin/addbonus:SUCCESS_CONTENT_ALL", {
-                        prefix: data.guild.prefix
+                        prefix: message.guild.settings.prefix
                     }))
                     .setColor(data.color)
                     .setFooter(data.footer);

commands/admin/addrank.js

@@ -14,39 +14,43 @@ module.exports = class extends Command {
     }
 
     async run (message, args, data) {
+
 
         const inviteCount = args[0];
         if (!inviteCount) return message.error("admin/addrank:MISSING_COUNT", {
-            prefix: data.guild.prefix
+            prefix: message.guild.settings.prefix
         });
         if (isNaN(inviteCount) || parseInt(inviteCount) < 1 || !Number.isInteger(parseInt(inviteCount))) return message.error("admin/addrank:INCORRECT_COUNT", {
-            prefix: data.guild.prefix
+            prefix: message.guild.settings.prefix
         });
-        let currentRank = data.guild.ranks.find((r) => r.inviteCount === inviteCount) || {};
+
+        const guildRanks = await this.client.database.fetchGuildRanks(message.guild.id);
+
+        let currentRank = guildRanks.find((r) => r.inviteCount === inviteCount) || {};
         const currentRole = message.guild.roles.cache.find((r) => r.id === currentRank.roleID);
         if (currentRank && currentRole) return message.error("admin/addrank:ALREADY_EXIST", {
-            prefix: data.guild.prefix,
+            prefix: message.guild.settings.prefix,
             count: currentRank.inviteCount,
             roleName: currentRole.name,
             roleID: currentRole.id
         });
 
         const role = message.mentions.roles.first() || message.guild.roles.cache.get(args.slice(1).join(" ")) || message.guild.roles.cache.find((role) => role.name === args.slice(1).join(" ") || (stringSimilarity.compareTwoStrings(role.name, args.slice(1).join(" ")) > 0.85));
         if (!role) return message.error("admin/addrank:MISSING_ROLE", {
-            prefix: data.guild.prefix
+            prefix: message.guild.settings.prefix
         });
         if (role.managed || role.id === message.guild.id) return message.error("admin/addrank:MANAGED");
         if (role.position > message.guild.me.roles.highest.position) return message.error("admin/addrank:MISSING_PERM", {
             roleName: role.name
         });
-        currentRank = data.guild.ranks.find((r) => r.roleID === role.id);
+        currentRank = guildRanks.find((r) => r.roleID === role.id);
         if (currentRank) return message.error("admin/addrank:ALREADY_USED", {
-            prefix: data.guild.prefix,
+            prefix: message.guild.settings.prefix,
             count: currentRank.inviteCount,
             roleID: role.id
         });
 
-        await data.guild.addRank(role.id, inviteCount);
+        await this.client.database.addGuildRank(message.guild.id, role.id, inviteCount);
 
         const embed = new Discord.MessageEmbed()
             .setAuthor(message.translate("admin/addrank:TITLE"))

commands/admin/blacklist.js

@@ -13,18 +13,24 @@ module.exports = class extends Command {
     }
 
     async run (message, args, data) {
+
+        const guildBlacklistedUsers = await this.client.database.fetchGuildBlacklistedUsers(message.guild.id);
+
         const embed = new Discord.MessageEmbed()
             .setColor(data.color)
             .setFooter(data.footer);
         const action = args[0];
         switch (action){
         case "add": {
-            const user = message.mentions.users.first() || await this.client.users.fetch(args[0]).catch(() => {});
+            const user = message.mentions.users.first() || await this.client.users.fetch(args[1]).catch(() => {});
             if (!user) return message.error("admin/blacklist:MISSING_MEMBER_ADD");
-            if (data.guild.blacklistedUsers.includes(user.id)) return message.error("admin/blacklist:ALREADY_BLACKLISTED", {
+            if (guildBlacklistedUsers.includes(user.id)) return message.error("admin/blacklist:ALREADY_BLACKLISTED", {
                 username: user.tag
             });
-            await data.guild.addUserBlacklist(user.id);
+            await this.client.database.addGuildBlacklistedUser({
+                guildID: message.guild.id,
+                userID: user.id
+            });
             message.success("admin/blacklist:SUCCESS_MEMBER_ADD", {
                 username: user.tag
             });
@@ -33,21 +39,24 @@ module.exports = class extends Command {
         case "remove": {
             const user = message.mentions.users.first() || await this.client.users.fetch(args[1]).catch(() => {});
             if (!user) return message.error("admin/blacklist:MISSING_MEMBER_REMOVE");
-            if (!data.guild.blacklistedUsers.includes(user.id)) return message.error("admin/blacklist:NOT_BLACKLISTED", {
+            if (!guildBlacklistedUsers.includes(user.id)) return message.error("admin/blacklist:NOT_BLACKLISTED", {
                 username: user.tag
             });
-            await data.guild.removeUserBlacklist(user.id);
+            await this.client.database.removeGuildBlacklistedUser({
+                guildID: message.guild.id,
+                userID: user.id
+            });
             message.success("admin/blacklist:SUCCESS_MEMBER_REMOVE", {
                 username: user.tag
             });
             break;
         }
         case "list": {
-            if (data.guild.blacklistedUsers.length < 1){
+            if (guildBlacklistedUsers.length < 1){
                 embed.setDescription(message.translate("admin/blacklist:EMPTY"));
             } else {
                 const users = [];
-                await this.client.functions.asyncForEach(data.guild.blacklistedUsers, async (userID) => {
+                await this.client.functions.asyncForEach(guildBlacklistedUsers, async (userID) => {
                     const user = await this.client.users.fetch(userID);
                     users.push(`${user.tag} (${user.toString()})`);
                 });

commands/admin/ranks.js

@@ -1,6 +1,6 @@
 const Command = require("../../structures/Command.js"),
     Discord = require("discord.js"),
-    Constants = require("../../Constants");
+    Constants = require("../../helpers/constants");
 
 module.exports = class extends Command {
     constructor (client) {
@@ -14,16 +14,18 @@ module.exports = class extends Command {
     }
 
     async run (message, args, data) {
+
+        const guildRanks = await this.client.database.fetchGuildRanks(message.guild.id);
 
         const embed = new Discord.MessageEmbed()
             .setColor(data.color)
             .setFooter(data.footer);
 
-        const ranks = data.guild.ranks.sort((a,b) => b.inviteCount - a.inviteCount);
+        const ranks = guildRanks.sort((a,b) => b.inviteCount - a.inviteCount);
         if (ranks.length === 0){
             embed.setAuthor(message.translate("admin/ranks:NO_RANK_TITLE"))
                 .setDescription(message.translate("admin/ranks:NO_RANK_CONTENT", {
-                    prefix: data.guild.prefix
+                    prefix: message.guild.settings.prefix
                 }));
             return message.channel.send(embed);
         }

commands/admin/removebonus.js

@@ -14,32 +14,47 @@ module.exports = class extends Command {
 
     async run (message, args, data) {
 
+        const guildBlacklistedUsers = await this.client.database.fetchGuildSubscriptions(message.guild.id);
 
         const bonus = args[0];
         if (!bonus) return message.error("admin/removebonus:MISSING_AMOUNT", {
-            prefix: data.guild.prefix
+            prefix: message.guild.settings.prefix
         });
         if (isNaN(bonus) || parseInt(bonus) < 1 || !Number.isInteger(parseInt(bonus))) return message.error("admin/removebonus:INVALID_AMOUNT", {
-            prefix: data.guild.prefix
+            prefix: message.guild.settings.prefix
         });
 
         const member = message.mentions.members.first() || await this.client.resolveMember(args.slice(1).join(" "), message.guild);
         if (!member && args[1] !== "all") return message.error("admin/removebonus:MISSING_TARGET", {
-            prefix: data.guild.prefix
+            prefix: message.guild.settings.prefix
         });
-        if (member && data.guild.blacklistedUsers.includes(member.id)) return message.error("admin/blacklist:BLACKLISTED", {
+        if (member && guildBlacklistedUsers.includes(member.id)) return message.error("admin/blacklist:BLACKLISTED", {
             username: member.user.username
         });
 
         if (member){
-            const memberData = await this.client.database.fetchMember(member.id, message.guild.id);
-            memberData.bonus -= parseInt(bonus);
-            await memberData.updateInvites();
+            const memberData = await this.client.database.fetchGuildMember({
+                userID: member.user.id,
+                guildID: message.guild.id,
+                storageID: message.guild.settings.storageID
+            });
+            if (memberData.notCreated) await this.client.database.createGuildMember({
+                userID: member.user.id,
+                guildID: message.guild.id,
+                storageID: message.guild.settings.storageID
+            });
+            await this.client.database.addInvites({
+                userID: member.user.id,
+                guildID: message.guild.id,
+                storageID: message.guild.settings.storageID,
+                number: -parseInt(bonus),
+                type: "bonus"
+            });
 
             const embed = new Discord.MessageEmbed()
                 .setAuthor(message.translate("admin/removebonus:SUCCESS_TITLE"))
                 .setDescription(message.translate("admin/removebonus:SUCCESS_CONTENT_MEMBER", {
-                    prefix: data.guild.prefix,
+                    prefix: message.guild.settings.prefix,
                     usertag: member.user.tag,
                     username: member.user.username
                 }))
@@ -57,18 +72,18 @@ module.exports = class extends Command {
 
                 await conf.sendT("misc:PLEASE_WAIT", null, true, false, "loading");
                 await message.guild.members.fetch();
-                const members = message.guild.members.cache.map((m) => {
-                    return {
-                        userID: m.id,
-                        guildID: message.guild.id
-                    };
+                await this.client.database.addGuildInvites({
+                    userID: message.guild.members.cache.map((m) => m.id),
+                    guildID: message.guild.id,
+                    storageID: message.guild.settings.storageID,
+                    number: -parseInt(bonus),
+                    type: "bonus"
                 });
-                await this.client.database.fetchMembers(members);
-                await this.client.database.removeBonusInvitesMembers(message.guild.id, bonus);
+
                 const embed = new Discord.MessageEmbed()
                     .setAuthor(message.translate("admin/removebonus:SUCCESS_TITLE"))
                     .setDescription(message.translate("admin/removebonus:SUCCESS_CONTENT_ALL", {
-                        prefix: data.guild.prefix
+                        prefix: message.guild.settings.prefix
                     }))
                     .setColor(data.color)
                     .setFooter(data.footer);