From a021c61222db950cf57f20772a1befea5040a4d6 Mon Sep 17 00:00:00 2001
From: "karl.hudgell" <karl.hudgell@bjss.com>
Date: Tue, 30 Jun 2020 10:09:22 +0100
Subject: [PATCH] working in order football today

---
 app.js                                        |  2 +-
 .../requests/football.js => lib/requests.js}  | 48 +++++++++++++------
 data/group/commands.js                        |  4 ++
 test.js                                       | 16 +++++--
 4 files changed, 52 insertions(+), 18 deletions(-)
 rename data/bot/{functions/requests/football.js => lib/requests.js} (52%)

diff --git a/app.js b/app.js
index ca0b14c..7fddc57 100644
--- a/app.js
+++ b/app.js
@@ -14,7 +14,7 @@ const TelegramBot = require('node-telegram-bot-api');
 const bot_chat = require('./data/bot/functions/chat')
 const bot_welcome = require('./data/bot/functions/welcomeMesage')
 const bot_questions = require('./data/bot/functions/questions')
-const bot_football = require('./data/bot/functions/requests/football')
+const bot_football = require('./data/bot/lib/requests')
 const bot_joke = require('./data/bot/functions/requests/joke')
 const bot_faq_subscription = require('./data/bot/functions/faq/subscriptions')
 const bot_subStatus = require('./data/bot/functions/requests/updateSubStatus')
diff --git a/data/bot/functions/requests/football.js b/data/bot/lib/requests.js
similarity index 52%
rename from data/bot/functions/requests/football.js
rename to data/bot/lib/requests.js
index 2a720fe..fb2db14 100644
--- a/data/bot/functions/requests/football.js
+++ b/data/bot/lib/requests.js
@@ -5,9 +5,8 @@ throttledRequest.configure({ requests: 8, milliseconds: 60000 }); //send 1 reque
 cachedRequest = require('cached-request')(throttledRequest);
 cachedRequest.setCacheDirectory("./cache");
 
-
 module.exports = {
-    gamesToday: (bot, msg, logger) => {
+    football_today: async (bot, msg, logger) => {
         logger.info("ID - " + msg.from.id + " First Name - " + msg.from.first_name + " asked for football today");
 
         var options = {
@@ -22,21 +21,18 @@ module.exports = {
             ttl: 18000000 //5 hours
         };
 
-        cachedRequest(options, function (error, response, body) {
-            // console.log(response)
+        cachedRequest(options, async function (error, response, body) {
             if (error) throw new Error(error);
-
-            // console.log(body);
             let jsonBody = JSON.parse(body)
             if (jsonBody.data.length > 0) {
-                bot.sendMessage(msg.chat.id, 'Yes there is!').then(() => {
-                    return jsonBody.data.forEach(function (entry) {
-                        var homeTeam = entry.localTeam.data.name
-                        var awayTeam = entry.visitorTeam.data.name
-                        var startTime = entry.time.starting_at.time
-                        // console.log(entry);
-                        bot.sendMessage(msg.chat.id, homeTeam + " VS " + awayTeam + " @ " + startTime)
-                    });
+                bot.sendMessage(msg.chat.id, 'Yes there is!').then(async () => {
+                    for (const x of jsonBody.data) {
+                        var homeTeam = x.localTeam.data.name
+                        var awayTeam = x.visitorTeam.data.name
+                        var startTime = x.time.starting_at.time
+                        await bot.sendMessage(msg.chat.id, homeTeam + " VS " + awayTeam + " @ " + startTime)
+                    }
+
                 }).then(() => {
                     return bot.sendMessage(msg.chat.id, 'To see what channels the football is streaming on please join @footballontv')
                 })
@@ -44,5 +40,29 @@ module.exports = {
                 bot.sendMessage(msg.chat.id, 'Sadly there is no football today :(')
             }
         })
+    },
+    joke: (bot, msg, logger, name) => {
+        logger.info("ID - " + msg.from.id + " First Name - " + msg.from.first_name + " asked for a joke");
+
+        var options = {
+            method: 'GET',
+            url: 'https://joke3.p.rapidapi.com/v1/joke',
+            // qs: { tz: 'Europe/London', leagues: '8', include: 'localTeam,visitorTeam' },
+            headers: {
+                'x-rapidapi-host': 'joke3.p.rapidapi.com',
+                'x-rapidapi-key': process.env.RAPIDAPI_API_KEY,
+                useQueryString: true
+            },
+            // ttl: 18000 //5 hours
+        };
+
+        request(options, function (error, response, body) {
+            // console.log(response)
+
+            if (error) throw new Error(error);
+            let jsonBody = JSON.parse(body)
+            bot.sendMessage(msg.chat.id, jsonBody.content)
+        }
+        )
     }
 }
diff --git a/data/group/commands.js b/data/group/commands.js
index bbc8378..b44b4fe 100644
--- a/data/group/commands.js
+++ b/data/group/commands.js
@@ -8,6 +8,10 @@ const commands = [
     {
         "NAME": "/sub_status",
         "TEXT": []
+    },
+    {
+        "NAME": "/start",
+        "TEXT": []
     }
 ]
 
diff --git a/test.js b/test.js
index 4b5b8c0..ac17795 100644
--- a/test.js
+++ b/test.js
@@ -17,7 +17,7 @@ const TelegramBot = require('node-telegram-bot-api');
 
 const common = require('./data/bot/lib/common')
 const questions = require('./data/bot/lib/questions')
-const football = require('./data/bot/functions/requests/football')
+const requests = require('./data/bot/lib/requests')
 
 const bot = new TelegramBot(token, { polling: true });
 
@@ -31,5 +31,15 @@ bot.on('message', (msg) => {
   }
 
   if (msg.text && msg.text.toString().includes("/football_today")) {
-    football.gamesToday(bot, msg, logger)
-  }})
\ No newline at end of file
+    requests.football_today(bot, msg, logger)
+  }
+
+  if (msg.text && msg.text.toString().includes("/joke")) {
+    requests.joke(bot, msg, logger)
+  }
+
+  if (msg.text && msg.text.toString().includes("/start")) {
+    common.commands(bot, msg, logger)
+  }
+
+})
\ No newline at end of file