Merge soundboard and airhorn, aliases, improve command formats

commands/search/flickr.js

@@ -10,6 +10,7 @@ module.exports = class FlickrCommand extends Command {
 			group: 'search',
 			memberName: 'flickr',
 			description: 'Searches Flickr for your query.',
+			nsfw: true,
 			args: [
 				{
 					key: 'query',

commands/search/rule34.js

@@ -5,7 +5,7 @@ module.exports = class Rule34Command extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'rule34',
-			aliases: ['rule34-image'],
+			aliases: ['rule34-image', 'r34'],
 			group: 'search',
 			memberName: 'rule34',
 			description: 'Responds with an image from Rule34, with optional query.',

commands/search/wikihow.js

@@ -6,7 +6,7 @@ module.exports = class WikihowCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'wikihow',
-			aliases: ['wikihow-article', 'how-to'],
+			aliases: ['wikihow-article', 'how-to', 'how'],
 			group: 'search',
 			memberName: 'wikihow',
 			description: 'Searches Wikihow for your query.',
@@ -15,7 +15,7 @@ module.exports = class WikihowCommand extends Command {
 					key: 'query',
 					prompt: 'What article would you like to search for?',
 					type: 'string',
-					parse: query => query.replace(/^(how to)/i, '')
+					parse: query => query.replace(/^((how )?to)/i, '')
 				}
 			]
 		});