Switch around arguments for tags

WeebDev · May 2, 2017 · bda4049 · bda4049
1 parent 2d13bc6
commit bda4049
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/commands/tags/add-example.js b/commands/tags/add-example.js
@@ -42,8 +42,8 @@ module.exports = class ExampleAddCommand extends Command {
 	}
 
 	async run(msg, args) {
-		const name = Util.cleanContent(args.name.toLowerCase(), msg);
-		const content = Util.cleanContent(args.content, msg);
+		const name = Util.cleanContent(msg, args.name.toLowerCase());
+		const content = Util.cleanContent(msg, args.content);
 		const tag = await Tag.findOne({ where: { name, guildID: msg.guild.id } });
 		if (tag) return msg.say(`An example with the name **${name}** already exists, ${msg.author}`);
 
@@ -54,8 +54,8 @@ module.exports = class ExampleAddCommand extends Command {
 			guildName: msg.guild.name,
 			channelID: msg.channel.id,
 			channelName: msg.channel.name,
-			name: name,
-			content: content,
+			name,
+			content,
 			type: true,
 			example: true
 		});

diff --git a/commands/tags/add-server.js b/commands/tags/add-server.js
@@ -41,8 +41,8 @@ module.exports = class ServerTagAddCommand extends Command {
 	}
 
 	async run(msg, args) {
-		const name = Util.cleanContent(args.name.toLowerCase(), msg);
-		const content = Util.cleanContent(args.content, msg);
+		const name = Util.cleanContent(msg, args.name.toLowerCase());
+		const content = Util.cleanContent(msg, args.content);
 		const tag = await Tag.findOne({ where: { name, guildID: msg.guild.id } });
 		if (tag) return msg.say(`A server tag with the name **${name}** already exists, ${msg.author}`);
 
@@ -53,8 +53,8 @@ module.exports = class ServerTagAddCommand extends Command {
 			guildName: msg.guild.name,
 			channelID: msg.channel.id,
 			channelName: msg.channel.name,
-			name: name,
-			content: content,
+			name,
+			content,
 			type: true
 		});
 

diff --git a/commands/tags/add.js b/commands/tags/add.js
@@ -37,8 +37,8 @@ module.exports = class TagAddCommand extends Command {
 	}
 
 	async run(msg, args) {
-		const name = Util.cleanContent(args.name.toLowerCase(), msg);
-		const content = Util.cleanContent(args.content, msg);
+		const name = Util.cleanContent(msg, args.name.toLowerCase());
+		const content = Util.cleanContent(msg, args.content);
 		const tag = await Tag.findOne({ where: { name, guildID: msg.guild.id } });
 		if (tag) return msg.say(`A tag with the name **${name}** already exists, ${msg.author}`);
 
@@ -49,8 +49,8 @@ module.exports = class TagAddCommand extends Command {
 			guildName: msg.guild.name,
 			channelID: msg.channel.id,
 			channelName: msg.channel.name,
-			name: name,
-			content: content
+			name,
+			content
 		});
 
 		return msg.say(`A tag with the name **${name}** has been added, ${msg.author}`);

diff --git a/util/Util.js b/util/Util.js
@@ -3,7 +3,7 @@ class Util {
 		throw new Error(`The ${this.constructor.name} class may not be instantiated.`);
 	}
 
-	static cleanContent(content, msg) {
+	static cleanContent(msg, content) {
 		return content.replace(/@everyone/g, '@\u200Beveryone')
 			.replace(/@here/g, '@\u200Bhere')
 			.replace(/<@&[0-9]+>/g, roles => {