convert processJsonSubredditsExplore to async function

このコミットが含まれているのは:
json 2021-09-08 12:28:45 +01:00
コミット e1df2ea8ae
2個のファイルの変更54行の追加49行の削除

ファイルの表示

@ -1,52 +1,58 @@
module.exports = function() { const config = require('../config');
const config = require('../config');
this.processJsonSubredditsExplore = (json, from, subreddit_front, user_preferences) => {
return new Promise(resolve => {
(async () => {
if(from === 'redis') {
json = JSON.parse(json)
}
if(json.error) {
resolve({ error: true, error_data: json })
} else {
let before = json.data.before
let after = json.data.after
let ret = { async function processJsonSubredditsExplore(
info: { json,
before: before, from,
after: after subreddit_front,
}, user_preferences
links: [] ) {
} if (from === 'redis') {
json = JSON.parse(json);
}
if (json.error) {
return { error: true, error_data: json };
} else {
let before = json.data.before;
let after = json.data.after;
let children_len = json.data.children.length let ret = {
info: {
before: before,
after: after,
},
links: [],
};
for(var i = 0; i < children_len; i++) { let children_len = json.data.children.length;
let data = json.data.children[i].data
for (var i = 0; i < children_len; i++) {
if(data.over_18) let data = json.data.children[i].data;
if((config.nsfw_enabled === false && user_preferences.nsfw_enabled != 'true') || user_preferences.nsfw_enabled === 'false')
continue if (data.over_18)
if (
let obj = { (config.nsfw_enabled === false &&
created: data.created_utc, user_preferences.nsfw_enabled != 'true') ||
id: data.id, user_preferences.nsfw_enabled === 'false'
over_18: data.over_18, )
display_name: data.display_name, continue;
display_name_prefixed: data.display_name_prefixed,
public_description: data.public_description, let obj = {
url: replaceDomains(data.url, user_preferences), created: data.created_utc,
subscribers: data.subscribers, id: data.id,
over_18: data.over18, over_18: data.over_18,
title: data.title, display_name: data.display_name,
subreddit_front: subreddit_front, display_name_prefixed: data.display_name_prefixed,
} public_description: data.public_description,
ret.links.push(obj) url: replaceDomains(data.url, user_preferences),
} subscribers: data.subscribers,
resolve(ret) over_18: data.over18,
} title: data.title,
})() subreddit_front: subreddit_front,
}) };
ret.links.push(obj);
}
return ret;
} }
} }
module.exports = processJsonSubredditsExplore;

ファイルの表示

@ -11,8 +11,7 @@ const processSearchResults = require('../inc/processSearchResults.js');
const processJsonSubreddit = require('../inc/processJsonSubreddit.js'); const processJsonSubreddit = require('../inc/processJsonSubreddit.js');
const tedditApiSubreddit = require('../inc/teddit_api/handleSubreddit.js')(); const tedditApiSubreddit = require('../inc/teddit_api/handleSubreddit.js')();
const processMoreComments = require('../inc/processMoreComments.js')(); const processMoreComments = require('../inc/processMoreComments.js')();
const processSubredditsExplore = const processJsonSubredditsExplore = require('../inc/processSubredditsExplore.js');
require('../inc/processSubredditsExplore.js')();
subredditRoutes.get('/r/:subreddit/search', (req, res, next) => { subredditRoutes.get('/r/:subreddit/search', (req, res, next) => {
let subreddit = req.params.subreddit; let subreddit = req.params.subreddit;