diff --git a/inc/teddit_api/handleSubreddit.js b/inc/teddit_api/handleSubreddit.js index d98c241..9b063c3 100644 --- a/inc/teddit_api/handleSubreddit.js +++ b/inc/teddit_api/handleSubreddit.js @@ -2,6 +2,7 @@ const processJsonSubreddit = require('../processJsonSubreddit'); const { processJsonSubredditAbout } = require('../processSubredditAbout'); const processSearchResults = require('../processSearchResults.js'); const { processJsonPostList, getPostItem } = require('../processJsonPost'); +const processJsonSubredditsExplore = require('../processSubredditsExplore.js'); module.exports = function () { const config = require('../../config'); @@ -169,6 +170,86 @@ module.exports = function () { await processJsonPostList(processed_json.posts, mode); + return res.end(JSON.stringify(processed_json)); + } + } + }; + this.handleTedditApiSubredditsExplore = async ( + json, + req, + res, + from, + api_type, + api_target, + query + ) => { + if (!config.api_enabled) { + res.setHeader('Content-Type', 'application/json'); + let msg = { + info: 'This instance do not support API requests. Please see https://codeberg.org/teddit/teddit#instances for instances that support API, or setup your own instance.', + }; + return res.end(JSON.stringify(msg)); + } + + console.log('Teddit API request - subreddit explore'); + if (from === 'redis') json = JSON.parse(json); + + if (api_type === 'rss') { + let protocol = config.https_enabled || config.api_force_https ? 'https' : 'http'; + let items = ''; + + let children_len = json.data.children.length; + + for (var i = 0; i < children_len; i++) { + let data = json.data.children[i].data; + + items += ` + + ${data.title} + ${data.created} + ${new Date( + data.created_utc * 1000 + ).toGMTString()} + ${data.id} + ${data.display_name} + ${data.display_name_prefixed} + ${replaceDomains(data.url, req.cookies)} + + ${data.subscribers} + ${data.over18} + + `; + } + + let title = `${query}`; + let link = `${protocol}://${config.domain}/subreddits/search?q=${query}`; + + let xml_output = ` + + + + ${title} + ${link} + Results for: ${query} + ${items} + + `; + res.setHeader('Content-Type', 'application/rss+xml'); + return res.end(xml_output); + } else { + res.setHeader('Content-Type', 'application/json'); + if (api_target === 'reddit') { + return res.end(JSON.stringify(json)); + } else { + let processed_json = await processJsonSubredditsExplore( + json, + true, + null, + req.cookies + ); + return res.end(JSON.stringify(processed_json)); } } diff --git a/routes/subreddit.js b/routes/subreddit.js index 441d570..82139fc 100644 --- a/routes/subreddit.js +++ b/routes/subreddit.js @@ -1010,6 +1010,14 @@ subredditRoutes.get('/subreddits/:sort?', (req, res, next) => { let before = req.query.before; let sortby = req.params.sort; let searching = false; + let api_req = req.query.api; + let api_type = req.query.type; + let api_target = req.query.target; + + if (req.query.hasOwnProperty('api')) api_req = true; + else api_req = false; + + let raw_json = api_req && req.query.raw_json == '1' ? 1 : 0; if (!after) { after = ''; @@ -1031,12 +1039,12 @@ subredditRoutes.get('/subreddits/:sort?', (req, res, next) => { sortby = ''; } - let key = `subreddits:sort:${sortby}${d}`; + let key = `subreddits:sort:${sortby}${d}:raw_json:${raw_json}`; if (sortby === 'search') { if (typeof q == 'undefined' || q == '') return res.redirect('/subreddits'); - key = `subreddits:search:q:${q}:nsfw:${nsfw}${d}`; + key = `subreddits:search:q:${q}:nsfw:${nsfw}${d}:raw_json:${raw_json}`; searching = true; } @@ -1052,48 +1060,60 @@ subredditRoutes.get('/subreddits/:sort?', (req, res, next) => { if (json) { console.log(`Got subreddits key from redis.`); (async () => { - let processed_json = await processJsonSubredditsExplore( - json, - 'redis', - null, - req.cookies - ); - if (!processed_json.error) { - return res.render('subreddits_explore', { - json: processed_json, - sortby: sortby, - after: after, - before: before, - q: q, - nsfw: nsfw, - searching: searching, - subreddits_front: !before && !after ? true : false, - user_preferences: req.cookies, - instance_nsfw_enabled: config.nsfw_enabled, - instance_config: config, - }); + if (api_req) { + return handleTedditApiSubredditsExplore( + json, + req, + res, + 'redis', + api_type, + api_target, + q + ); } else { - return res.render('subreddits_explore', { - json: null, - error: true, - data: processed_json, - user_preferences: req.cookies, - instance_config: config, - }); + let processed_json = await processJsonSubredditsExplore( + json, + 'redis', + null, + req.cookies + ); + if (!processed_json.error) { + return res.render('subreddits_explore', { + json: processed_json, + sortby: sortby, + after: after, + before: before, + q: q, + nsfw: nsfw, + searching: searching, + subreddits_front: !before && !after ? true : false, + user_preferences: req.cookies, + instance_nsfw_enabled: config.nsfw_enabled, + instance_config: config, + }); + } else { + return res.render('subreddits_explore', { + json: null, + error: true, + data: processed_json, + user_preferences: req.cookies, + instance_config: config, + }); + } } })(); } else { let url = ''; if (config.use_reddit_oauth) { if (!searching) - url = `https://oauth.reddit.com/subreddits/${sortby}?api_type=json&count=25&g=GLOBAL&t=${d}`; + url = `https://oauth.reddit.com/subreddits/${sortby}?api_type=json&count=25&g=GLOBAL&t=${d}&raw_json=${raw_json}`; else - url = `https://oauth.reddit.com/subreddits/search?api_type=json&q=${q}&include_over_18=${nsfw}${d}`; + url = `https://oauth.reddit.com/subreddits/search?api_type=json&q=${q}&include_over_18=${nsfw}${d}&raw_json=${raw_json}`; } else { if (!searching) - url = `https://reddit.com/subreddits/${sortby}.json?api_type=json&count=25&g=GLOBAL&t=${d}`; + url = `https://reddit.com/subreddits/${sortby}.json?api_type=json&count=25&g=GLOBAL&t=${d}&raw_json=${raw_json}`; else - url = `https://reddit.com/subreddits/search.json?api_type=json&q=${q}&include_over_18=${nsfw}${d}`; + url = `https://reddit.com/subreddits/search.json?api_type=json&q=${q}&include_over_18=${nsfw}${d}&raw_json=${raw_json}`; } fetch(encodeURI(url), redditApiGETHeaders()) @@ -1117,25 +1137,37 @@ subredditRoutes.get('/subreddits/:sort?', (req, res, next) => { } else { console.log(`Fetched the JSON from reddit.com/subreddits.`); (async () => { - let processed_json = await processJsonSubredditsExplore( - json, - 'from_online', - null, - req.cookies - ); - return res.render('subreddits_explore', { - json: processed_json, - sortby: sortby, - after: after, - before: before, - q: q, - nsfw: nsfw, - searching: searching, - subreddits_front: !before && !after ? true : false, - user_preferences: req.cookies, - instance_nsfw_enabled: config.nsfw_enabled, - instance_config: config, - }); + if (api_req) { + return handleTedditApiSubredditsExplore( + json, + req, + res, + 'from_online', + api_type, + api_target, + q + ); + } else { + let processed_json = await processJsonSubredditsExplore( + json, + 'from_online', + null, + req.cookies + ); + return res.render('subreddits_explore', { + json: processed_json, + sortby: sortby, + after: after, + before: before, + q: q, + nsfw: nsfw, + searching: searching, + subreddits_front: !before && !after ? true : false, + user_preferences: req.cookies, + instance_nsfw_enabled: config.nsfw_enabled, + instance_config: config, + }); + } })(); } });