convert processJsonSubredditsExplore to async function
This commit is contained in:
parent
6ced924bc8
commit
e1df2ea8ae
|
@ -1,33 +1,40 @@
|
|||
module.exports = function() {
|
||||
const config = require('../config');
|
||||
this.processJsonSubredditsExplore = (json, from, subreddit_front, user_preferences) => {
|
||||
return new Promise(resolve => {
|
||||
(async () => {
|
||||
|
||||
async function processJsonSubredditsExplore(
|
||||
json,
|
||||
from,
|
||||
subreddit_front,
|
||||
user_preferences
|
||||
) {
|
||||
if (from === 'redis') {
|
||||
json = JSON.parse(json)
|
||||
json = JSON.parse(json);
|
||||
}
|
||||
if (json.error) {
|
||||
resolve({ error: true, error_data: json })
|
||||
return { error: true, error_data: json };
|
||||
} else {
|
||||
let before = json.data.before
|
||||
let after = json.data.after
|
||||
let before = json.data.before;
|
||||
let after = json.data.after;
|
||||
|
||||
let ret = {
|
||||
info: {
|
||||
before: before,
|
||||
after: after
|
||||
after: after,
|
||||
},
|
||||
links: []
|
||||
}
|
||||
links: [],
|
||||
};
|
||||
|
||||
let children_len = json.data.children.length
|
||||
let children_len = json.data.children.length;
|
||||
|
||||
for (var i = 0; i < children_len; i++) {
|
||||
let data = json.data.children[i].data
|
||||
let data = json.data.children[i].data;
|
||||
|
||||
if (data.over_18)
|
||||
if((config.nsfw_enabled === false && user_preferences.nsfw_enabled != 'true') || user_preferences.nsfw_enabled === 'false')
|
||||
continue
|
||||
if (
|
||||
(config.nsfw_enabled === false &&
|
||||
user_preferences.nsfw_enabled != 'true') ||
|
||||
user_preferences.nsfw_enabled === 'false'
|
||||
)
|
||||
continue;
|
||||
|
||||
let obj = {
|
||||
created: data.created_utc,
|
||||
|
@ -41,12 +48,11 @@ module.exports = function() {
|
|||
over_18: data.over18,
|
||||
title: data.title,
|
||||
subreddit_front: subreddit_front,
|
||||
};
|
||||
ret.links.push(obj);
|
||||
}
|
||||
ret.links.push(obj)
|
||||
}
|
||||
resolve(ret)
|
||||
}
|
||||
})()
|
||||
})
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = processJsonSubredditsExplore;
|
||||
|
|
|
@ -11,8 +11,7 @@ const processSearchResults = require('../inc/processSearchResults.js');
|
|||
const processJsonSubreddit = require('../inc/processJsonSubreddit.js');
|
||||
const tedditApiSubreddit = require('../inc/teddit_api/handleSubreddit.js')();
|
||||
const processMoreComments = require('../inc/processMoreComments.js')();
|
||||
const processSubredditsExplore =
|
||||
require('../inc/processSubredditsExplore.js')();
|
||||
const processJsonSubredditsExplore = require('../inc/processSubredditsExplore.js');
|
||||
|
||||
subredditRoutes.get('/r/:subreddit/search', (req, res, next) => {
|
||||
let subreddit = req.params.subreddit;
|
||||
|
|
Loading…
Reference in New Issue