Merge branch 'master' of https://gitlab.com/loicbersier/discordbot

commands/owner/serverblacklist.js

@@ -27,7 +27,7 @@ class serverBlacklistCommand extends Command {
 	}
 
 	async exec(message, args) {
-		const blacklist = await guildBlacklist.findOne({where: {guildID:message.author.id}});
+		const blacklist = await guildBlacklist.findOne({where: {guildID:args.guildID}});
 		
 		if (!blacklist) {
 			const body = {guildID: args.guildID};

event/listeners/guildCreate.js

@@ -30,7 +30,7 @@ class guildCreateListener extends Listener {
 			.setFooter(`I'm now in ${this.client.guilds.cache.size} servers!`)
 			.setTimestamp();
 
-		const blacklist = await userBlacklist.findOne({where: {userID:guild.owner.id}});
+		const blacklist = await userBlacklist.findOne({where: {userID:guild.id}});
 
 		if (blacklist) {
 			guild.leave();

event/listeners/guildDelete.js

@@ -32,7 +32,7 @@ class guildCreateListener extends Listener {
 			.setFooter(`I'm now in ${this.client.guilds.cache.size} servers!`)
 			.setTimestamp();
 
-		const blacklist = await userBlacklist.findOne({where: {userID:guild.owner.id}});
+		const blacklist = await userBlacklist.findOne({where: {userID:guild.id}});
 
 		if (blacklist) {
 			guild.leave();