diff --git a/bot.js b/bot.js index a0cdbfd..806b037 100644 --- a/bot.js +++ b/bot.js @@ -227,19 +227,22 @@ function handleRedditBooruJson(data) { } // Makes an async url request with the provided function: 'process'. -function asyncSiteRequest(url, process) { +async function asyncReddit(message) { - fetch(url) - .then(data => { - return process(data); - }) - .then(res => { - return res; - }) - .catch(error => { - sendToBotTestingChannel('async:' + error.message); - return ""; - }) + // test command for async site request + + let messageSplit = message.content.substring(2).split(' '); + if (messageSplit.length === 2) { + let reddit_url = "https://www.reddit.com/r/" + + messageSplit[1].replace(/[^a-zA-Z0-9_\-]+/g, '') + + "/.json?show=all&count=25&limit=100"; + + let reddit_json = await loadJson(reddit_url); + let reddit_response = handleRedditJson(reddit_json); + sendToBotTestingChannel("reddit_url:" + reddit_url + "\nreddit_json:" + reddit_json + "\nreddit_response:" + reddit_response); + } else { + sendToBotTestingChannel("message split length:" + messageSplit.length); + } } async function loadJson(url) { @@ -655,20 +658,7 @@ client.on('message', message => { break; case 'async': - // test command for async site request - - let messageSplit = message.content.substring(2).split(' '); - if (messageSplit.length === 2) { - let reddit_url = "https://www.reddit.com/r/" - + messageSplit[1].replace(/[^a-zA-Z0-9_\-]+/g, '') - + "/.json?show=all&count=25&limit=100"; - - let reddit_json = loadJson(reddit_url); - let reddit_response = handleRedditJson(reddit_json); - sendToBotTestingChannel("reddit_url:" + reddit_url + "\nreddit_json:" + reddit_json + "\nreddit_response:" + reddit_response); - } else { - sendToBotTestingChannel("message split length:" + messageSplit.length); - } + asyncReddit(message); break; // Voice commands