From b722e83b47d343b9d6eb6781ed9dc59395f73894 Mon Sep 17 00:00:00 2001 From: Dalton Date: Tue, 11 Dec 2018 23:22:10 -0800 Subject: [PATCH] async edits, redditbooru no worky? --- bot.js | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/bot.js b/bot.js index 2d3f185..def341a 100644 --- a/bot.js +++ b/bot.js @@ -125,12 +125,8 @@ function noQuestion() { // 3. RedditBooru function bestEffortRequest(subpage, page_max) { - let reddit_url = "https://www.reddit.com/r/" + subpage + "/.json?show=all&count=25&limit=100"; - // todo resolve async issues - //let reddit_response = asyncSiteRequest(reddit_url, handleRedditJson); let reddit_response = subredditRequest(subpage); if (reddit_response) { - //sendToBotTestingChannel("found content on reddit:" + reddit_response); return reddit_response; } @@ -138,22 +134,15 @@ function bestEffortRequest(subpage, page_max) { if (page_max) { imgur_response = imgurRequest(subpage, page_max); if (imgur_response) { - //sendToBotTestingChannel("found content on imgur:" + imgur_response); return imgur_response } } - let redditbooru_url = "https://" + subpage + ".redditbooru.com/images/?limit=1000"; - // todo resolve async issues - //let redditbooru_response = asyncSiteRequest(redditbooru_url, handleRedditBooruJson); let redditbooru_response = redditbooruRequest(subpage); if (redditbooru_response) { - //sendToBotTestingChannel("found content on redditbooru:" + redditbooru_response); return redditbooru_response } - // leaving this here for debug. - //sendToBotTestingChannel('reddit:' + reddit_response + '\nimgur:' + imgur_response + '\nredditbooru:' + redditbooru_response); return "I couldn't find that, sauce?"; } @@ -226,6 +215,7 @@ function getUrlListFromRedditBooru(json) { return url_list; } +// Async request of a page that returns JSON. async function loadJson(url) { let response = await fetch(url); if (response.status === 200) { @@ -252,6 +242,7 @@ async function asyncImageRequest(channelMessage) { //let redditbooru_json = await loadJson("https://" + requested_item + ".redditbooru.com/images/?limit=1000"); image_url_list.concat(getUrlListFromReddit(reddit_json), getUrlListFromImgur(imgur_json)); //, getUrlListFromRedditBooru(redditbooru_json) + console.log(image_url_list); if (image_url_list) { return image_url_list[getRandomInt(0, image_url_list - 1)];