Merge remote-tracking branch 'origin/master'

commands/admin/log.js

@@ -7,6 +7,7 @@ class logCommand extends Command {
 			aliases: ['log', 'logging'],
 			category: 'admin',
 			userPermissions: ['MANAGE_MESSAGES'],
+			clientPermissions: ['MANAGE_GUILD'],
 			channel: 'guild',
 			description: {
 				content: 'Setup logging in current channel (W.I.P)',

commands/general/memerclub.js

@@ -12,6 +12,7 @@ class memerclubCommand extends Command {
 				{
 					id: 'text',
 					type: 'string',
+					default: '',
 					match: 'rest'
 				}
 			],

commands/general/tweet.js

@@ -53,7 +53,7 @@ class tweetCommand extends Command {
 		
 
 		if (args.text)
-			if (args.text.includes('discord.gg')) return message.channel.send('No discord invite allowed.');
+			if (args.text.includes('discord.gg') || args.text.includes('discord.com/invite/')) return message.channel.send('No discord invite allowed.');
 		
 		
 		const client = this.client;

event/listeners/log/roleUpdate.js

@@ -13,7 +13,7 @@ class roleUpdateListener extends Listener {
 	}
 
 	async exec(oldRole, newRole) {
-		if (oldRole === newRole) return;
+		if (oldRole === newRole || oldRole.rawPosition !== newRole.rawPosition) return;
 		const guild = oldRole.guild;
 		const logStats = await LogStats.findOne({where: {guild: guild.id}});
 		if (logStats) {