Remove tons of faulty awaits

commands/search/botinfo.js

@@ -25,7 +25,7 @@ module.exports = class BotSearchCommand extends commando.Command {
         console.log(`[Command] ${message.content}`);
         if (message.mentions.users.size === 1) {
             let botToFind = message.mentions.users.first().id;
-            await request
+            return request
                 .get(`https://bots.discord.pw/api/bots/${botToFind}`)
                 .set({
                     'Authorization': config.botskey

commands/search/define.js

@@ -26,7 +26,7 @@ module.exports = class DefineCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let defineThis = encodeURI(message.content.split(" ").slice(1).join(" "));
-        await request
+        return request
             .get(`http://api.wordnik.com:80/v4/word.json/${defineThis}/definitions`)
             .query({
                 limit: 1,

commands/search/forecast.js

@@ -22,7 +22,7 @@ module.exports = class ForecastCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let locationToSearch = message.content.split(" ").slice(1).join(" ");
-        await weather(locationToSearch, 'f').then(info => {
+        return weather(locationToSearch, 'f').then(info => {
             const embed = new Discord.RichEmbed()
                 .setColor(0x0000FF)
                 .setAuthor(info.title, 'http://media.idownloadblog.com/wp-content/uploads/2013/12/yahoo-weather-213x220.png')

commands/search/google.js

@@ -24,7 +24,7 @@ module.exports = class DefineCommand extends commando.Command {
         console.log(`[Command] ${message.content}`);
         let thingToSearch = encodeURI(message.content.split(" ").slice(1).join(" "));
         await message.channel.send('Searching...').then(msg => {
-            await request
+            return request
                 .get(`https://www.google.com/search?q=${thingToSearch}`)
                 .then(function(response) {
                     const $ = cheerio.load(response.text);

commands/search/image.js

@@ -24,7 +24,7 @@ module.exports = class DefineCommand extends commando.Command {
         console.log(`[Command] ${message.content}`);
         let thingToSearch = encodeURI(message.content.split(" ").slice(1).join(" "));
         await message.channel.send('Searching...').then(msg => {
-            await request
+            return request
                 .get(`https://www.google.com/search?tbm=isch&gs_l=img&q=${encodeURI(thingToSearch)}`)
                 .then(function(response) {
                     const $ = cheerio.load(response.text);

commands/search/osu.js

@@ -25,7 +25,7 @@ module.exports = class OsuCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let usernameToSearch = message.content.split(" ").slice(1).join(" ");
-        await request
+        return request
             .get('https://osu.ppy.sh/api/get_user')
             .query({
                 k: config.osukey,

commands/search/wattpad.js

@@ -20,7 +20,7 @@ module.exports = class WattpadCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let queryBook = message.content.split(" ").slice(1).join(" ");
-        await request
+        return request
             .get('https://api.wattpad.com:443/v4/stories')
             .set({
                 'Authorization': `Basic ${config.wattpadkey}`

commands/search/weather.js

@@ -19,7 +19,7 @@ module.exports = class WeatherCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let locationToSearch = message.content.split(" ").slice(1).join(" ");
-        await weather(locationToSearch, 'f').then(info => {
+        return weather(locationToSearch, 'f').then(info => {
             const embed = new Discord.RichEmbed()
                 .setColor(0x0000FF)
                 .setAuthor(info.title, 'http://media.idownloadblog.com/wp-content/uploads/2013/12/yahoo-weather-213x220.png')

commands/search/wikipedia.js

@@ -20,7 +20,7 @@ module.exports = class WikipediaCommand extends commando.Command {
         console.log(`[Command] ${message.content}`);
         let thingToSearch = encodeURI(message.content.split(" ").slice(1).join(" "));
         thingToSearch = thingToSearch.split(")").join("%29");
-        await request
+        return request
             .get(`https://en.wikipedia.org/w/api.php?action=query&prop=extracts&format=json&titles=${thingToSearch}&exintro=&explaintext=&redirects=&formatversion=2`)
             .then(function(response) {
                 let description = response.body.query.pages[0].extract;

commands/search/youtube.js

@@ -23,7 +23,7 @@ module.exports = class YouTubeCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let videoToSearch = message.content.split(" ").slice(1).join("-");
-        await request
+        return request
             .get('https://www.googleapis.com/youtube/v3/search')
             .query({
                 part: 'snippet',

commands/search/yugioh.js

@@ -19,7 +19,7 @@ module.exports = class YuGiOhCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let cardName = encodeURI(message.content.split(" ").slice(1).join(" "));
-        await request
+        return request
             .get(`http://yugiohprices.com/api/card_data/${cardName}`)
             .then(function(response) {
                 if (response.body.data.card_type === 'monster') {

commands/textedit/rin.js

@@ -25,7 +25,7 @@ module.exports = class RinSayCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let rinContent = message.content.split(" ").slice(1).join(" ");
-        await request
+        return request
             .post(config.webhook)
             .send({
                 content: rinContent

commands/textedit/translate.js

@@ -138,7 +138,7 @@ module.exports = class TranslateCommand extends commando.Command {
                 return message.channel.send(":x: Error! Please keep translations below 200 characters!");
             }
             else {
-                await translate(thingToTranslate, {
+                return translate(thingToTranslate, {
                     to: languageto
                 }).then(res => {
                     let languagefrom = res.from.language.iso.toLowerCase();

commands/textedit/yoda.js

@@ -23,7 +23,7 @@ module.exports = class YodaCommand extends commando.Command {
             return message.channel.send(':x: Error! Nothing to translate!');
         }
         else {
-            await request
+            return request
                 .get('https://yoda.p.mashape.com/yoda')
                 .set({
                     'X-Mashape-Key': config.mashapekey,