Added broadcasts and statuses

Changed some commands to be more concise
Updated the way arguments are handled to allow for
full sentences instead of single words

Author: invalidCards

wikilinker.js

@@ -37,15 +37,21 @@ bot.on('message', (msg) => {
 	if (msg.author.bot || !msg.guild || !trulyReady) return;
 
 	if (msg.content.startsWith(config.prefix)) {
-		const args = msg.content.slice(config.prefix.length).split(' ');
+		const args = msg.content.slice(config.prefix.length).split(/ (.+)/);
 		const command = args.shift();
 		if (commands.hasOwnProperty(command)) commands[command](msg, args);
 	} else if (/\[\[([^\]|]+)(?:|[^\]]+)?\]\]/g.test(msg.cleanContent) || /\{\{([^}|]+)(?:|[^}]+)?\}\}/g.test(msg.cleanContent) || /--([^\-|]+)(?:|[^-]+)?--/g.test(msg.cleanContent)) {
 		if (!msg.guild.settings.wiki) {
-			// eslint-disable-next-line consistant-return
-			return msg.channel.sendMessage([
+			// eslint-disable-next-line consistent-return
+			return msg.channel.send([
 				'This server has not set a default wiki yet.',
-				'Users with the "Administrator" permission can do this using %setWiki <wikiname>.'
+				'Users with the "Administrator" permission can do this using wl~swiki <wikiname>.'
+			]);
+		} else if (!msg.guild.settings.broadcastChannel) {
+			// eslint-disable-next-line consistent-return
+			return msg.channel.send([
+				'This server has not set a broadcast channel yet.',
+				'Users with the "Administrator" permission can do this using wl~broadcastchan <channel mention>.'
 			]);
 		}
 
@@ -92,7 +98,7 @@ bot.on('message', (msg) => {
 				preparedSend = preparedSend.filter(item => item !== undefined);
 				if (preparedSend.length > 1) {
 					console.log('Sending message...');
-					msg.channel.sendMessage(preparedSend);
+					msg.channel.send(preparedSend);
 				}
 			})
 			.catch(console.error);
@@ -106,35 +112,82 @@ bot.on('message', (msg) => {
 
 const commands = {
 	help: (msg) => {
-		msg.channel.sendMessage('Syntax and commands: <https://github.com/ThePsionic/RSWikiLinker#syntax>');
+		msg.channel.send('Syntax and commands: <https://github.com/ThePsionic/RSWikiLinker#syntax>');
 	},
 	restart: (msg) => {
-		if (msg.author.id !== config.admin_snowflake) return msg.channel.sendMessage("Sorry, Dave. I can't let you do that.");
-		return msg.channel.sendMessage('**Bot restarting!**')
+		if (msg.author.id !== config.admin_snowflake) return msg.channel.send("Sorry, Dave. I can't let you do that.");
+		return msg.channel.send('**Bot restarting!**')
 			.then(() => {
 				process.exit(1);
 			});
 	},
-	setWiki: (msg, [wiki]) => {
+	// eslint-disable-next-line consistent-return
+	broadcast: (msg, [globalMessage]) => {
+		if (msg.author.id !== config.admin_snowflake) return msg.reply("you don't get to yell at everyone!");
+		var joinedGuilds = Array.from(bot.guilds.keys());
+		for (var i = 0; i < joinedGuilds.length; i++) {
+			var guildID = joinedGuilds[i];
+			if (db[guildID].broadcastChannel) {
+				return bot.channels.get(db[guildID].broadcastChannel).send(globalMessage);
+			}
+		}
+	},
+	swiki: (msg, [wiki]) => {
 		if (msg.author.id !== config.admin_snowflake || !msg.member.hasPermission('ADMINISTRATOR')) {
 			return msg.reply('You are not allowed to change the default wiki of this server.');
 		}
-		db[msg.guild.id].wiki = wiki;
+		db[msg.guild.id].wiki = wiki.split(' ')[0];
 		return saveDB().then(() => {
 			msg.reply(`Wiki is now set to: ${wiki}.`);
 		}).catch(console.error);
 	},
-	cOverride: (msg, [wiki]) => {
+	cwiki: (msg, [wiki]) => {
 		if (msg.author.id !== config.admin_snowflake || !msg.member.hasPermission('ADMINISTRATOR')) {
 			return msg.reply('You are not allowed to override the wiki of this channel.');
 		} else if (msg.channel.id === msg.guild.id) {
 			return msg.reply('You can\'t override the default channel of a server.');
 		}
 		if (!db[msg.guild.id].channelOverrides) db[msg.guild.id].channelOverrides = {};
-		db[msg.guild.id].channelOverrides[msg.channel.id] = wiki;
+		db[msg.guild.id].channelOverrides[msg.channel.id] = wiki.split(' ')[0];
 		return saveDB().then(() => {
 			msg.reply(`Wiki in this channel is now set to: ${wiki}.`);
 		}).catch(console.error);
+	},
+	broadcastchan: (msg) => {
+		if (!msg.mentions.channels || msg.mentions.channels.size > 1) {
+			return msg.reply('You need to mention exactly one channel to be set as broadcast channel.');
+		} else {
+			var channel = msg.mentions.channels.first();
+			db[msg.guild.id].broadcastChannel = channel.id;
+			return saveDB().then(() => {
+				msg.reply(`The broadcast channel for this server is now set to: ${channel.name}.`);
+			});
+		}
+	},
+	serverinfo: (msg) => {
+		if (!msg.guild) return;
+		var totalMessage = `\`\`\`\nInfo for server: ${msg.guild.name}`;
+		if (!msg.guild.settings.broadcastChannel) {
+			totalMessage += '\nNo broadcast channel set';
+		} else {
+			totalMessage += `\nBroadcast channel: ${msg.guild.channels.get(msg.guild.settings.broadcastChannel).name}`;
+		}
+		if (!msg.guild.settings.wiki) {
+			totalMessage += '\nNo main wiki set';
+		} else {
+			totalMessage += `\nMain wiki: ${msg.guild.settings.wiki}`;
+		}
+		if (!msg.guild.settings.channelOverrides) {
+			totalMessage += '\nNo channel overrides set';
+		} else {
+			totalMessage += '\nChannel overrides:';
+			var channelIDs = Object.keys(msg.guild.settings.channelOverrides);
+			for (var i = 0; i < channelIDs.length; i++) {
+				totalMessage += `\n  Wiki ${msg.guild.settings.channelOverrides[channelIDs[i]]} in channel ${msg.guild.channels.get(channelIDs[i]).name}`;
+			}
+		}
+		totalMessage += '\n```';
+		msg.channel.send(totalMessage);
 	}
 };