convert processJsonSubreddit to async function
This commit is contained in:
json
parent
153a50e60a
commit
6ff892767c
|
|
@ -1,45 +1,53 @@
|
|||
module.exports = function() {
|
||||
const config = require('../config');
|
||||
const link = require('./components/link')
|
||||
this.processJsonSubreddit = (json, from, subreddit_front, user_preferences, saved) => {
|
||||
return new Promise(resolve => {
|
||||
(async () => {
|
||||
const link = require('./components/link');
|
||||
|
||||
async function processJsonSubreddit(
|
||||
json,
|
||||
from,
|
||||
subreddit_front,
|
||||
user_preferences,
|
||||
saved
|
||||
) {
|
||||
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 {
|
||||
if (saved) {
|
||||
let t = {
|
||||
data: {
|
||||
data: {
|
||||
before: null,
|
||||
after: null,
|
||||
children: json
|
||||
}
|
||||
}
|
||||
json = t
|
||||
children: json,
|
||||
},
|
||||
};
|
||||
json = t;
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
/*
|
||||
// Todo: Remove this once the link component is done
|
||||
|
|
@ -71,13 +79,12 @@ module.exports = function() {
|
|||
user_flair: (user_preferences.flairs != 'false' ? await formatUserFlair(data) : '')
|
||||
} */
|
||||
|
||||
let obj = await link.fromJson(data, user_preferences, subreddit_front)
|
||||
let obj = await link.fromJson(data, user_preferences, subreddit_front);
|
||||
|
||||
ret.links.push(obj)
|
||||
ret.links.push(obj);
|
||||
}
|
||||
resolve(ret)
|
||||
}
|
||||
})()
|
||||
})
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = processJsonSubreddit;
|
||||
|
|
|
|||
|
|
@ -1,114 +1,130 @@
|
|||
const processJsonSubreddit = require('../processJsonSubreddit');
|
||||
|
||||
module.exports = function () {
|
||||
const config = require('../../config')
|
||||
this.handleTedditApiSubreddit = async (json, req, res, from, api_type, api_target, subreddit) => {
|
||||
const config = require('../../config');
|
||||
this.handleTedditApiSubreddit = async (
|
||||
json,
|
||||
req,
|
||||
res,
|
||||
from,
|
||||
api_type,
|
||||
api_target,
|
||||
subreddit
|
||||
) => {
|
||||
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))
|
||||
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')
|
||||
let _json = json // Keep the original json
|
||||
if(from === 'redis')
|
||||
json = JSON.parse(json)
|
||||
console.log('Teddit API request - subreddit');
|
||||
let _json = json; // Keep the original json
|
||||
if (from === 'redis') json = JSON.parse(json);
|
||||
|
||||
if (api_type === 'rss') {
|
||||
let protocol = (config.https_enabled ? 'https' : 'http')
|
||||
let items = ''
|
||||
let protocol = config.https_enabled ? 'https' : 'http';
|
||||
let items = '';
|
||||
for (var i = 0; i < json.data.children.length; i++) {
|
||||
let link = json.data.children[i].data
|
||||
let thumbnail = ''
|
||||
let post_image = ''
|
||||
let is_self_link = false
|
||||
let valid_reddit_self_domains = ['reddit.com']
|
||||
let link = json.data.children[i].data;
|
||||
let thumbnail = '';
|
||||
let post_image = '';
|
||||
let is_self_link = false;
|
||||
let valid_reddit_self_domains = ['reddit.com'];
|
||||
|
||||
if (link.domain) {
|
||||
let tld = link.domain.split('self.')
|
||||
let tld = link.domain.split('self.');
|
||||
if (tld.length > 1) {
|
||||
if (!tld[1].includes('.')) {
|
||||
is_self_link = true
|
||||
link.url = teddifyUrl(link.url)
|
||||
is_self_link = true;
|
||||
link.url = teddifyUrl(link.url);
|
||||
}
|
||||
}
|
||||
if(config.valid_media_domains.includes(link.domain) || valid_reddit_self_domains.includes(link.domain)) {
|
||||
is_self_link = true
|
||||
link.url = teddifyUrl(link.url)
|
||||
if (
|
||||
config.valid_media_domains.includes(link.domain) ||
|
||||
valid_reddit_self_domains.includes(link.domain)
|
||||
) {
|
||||
is_self_link = true;
|
||||
link.url = teddifyUrl(link.url);
|
||||
}
|
||||
}
|
||||
|
||||
if (link.preview && link.thumbnail !== 'self') {
|
||||
if (!link.url.startsWith('/r/') && isGif(link.url)) {
|
||||
let s = await downloadAndSave(link.thumbnail, 'thumb_')
|
||||
thumbnail = `${protocol}://${config.domain}${s}`
|
||||
let s = await downloadAndSave(link.thumbnail, 'thumb_');
|
||||
thumbnail = `${protocol}://${config.domain}${s}`;
|
||||
} else {
|
||||
if (link.preview.images[0].resolutions[0]) {
|
||||
let s = await downloadAndSave(link.preview.images[0].resolutions[0].url, 'thumb_')
|
||||
thumbnail = `${protocol}://${config.domain}${s}`
|
||||
let s = await downloadAndSave(
|
||||
link.preview.images[0].resolutions[0].url,
|
||||
'thumb_'
|
||||
);
|
||||
thumbnail = `${protocol}://${config.domain}${s}`;
|
||||
if (!isGif(link.url) && !link.post_hint.includes(':video')) {
|
||||
s = await downloadAndSave(link.preview.images[0].source.url)
|
||||
post_image = `${protocol}://${config.domain}${s}`
|
||||
s = await downloadAndSave(link.preview.images[0].source.url);
|
||||
post_image = `${protocol}://${config.domain}${s}`;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
link.permalink = `${protocol}://${config.domain}${link.permalink}`
|
||||
link.permalink = `${protocol}://${config.domain}${link.permalink}`;
|
||||
|
||||
if(is_self_link)
|
||||
link.url = link.permalink
|
||||
if (is_self_link) link.url = link.permalink;
|
||||
|
||||
if (req.query.hasOwnProperty('full_thumbs')) {
|
||||
if(!post_image)
|
||||
post_image = thumbnail
|
||||
if (!post_image) post_image = thumbnail;
|
||||
|
||||
thumbnail = post_image
|
||||
thumbnail = post_image;
|
||||
}
|
||||
|
||||
let enclosure = ''
|
||||
let enclosure = '';
|
||||
if (thumbnail != '') {
|
||||
let mime = ''
|
||||
let ext = thumbnail.split('.').pop()
|
||||
if(ext === 'png')
|
||||
mime = 'image/png'
|
||||
else
|
||||
mime = 'image/jpeg'
|
||||
enclosure = `<enclosure length="0" type="${mime}" url="${thumbnail}" />`
|
||||
let mime = '';
|
||||
let ext = thumbnail.split('.').pop();
|
||||
if (ext === 'png') mime = 'image/png';
|
||||
else mime = 'image/jpeg';
|
||||
enclosure = `<enclosure length="0" type="${mime}" url="${thumbnail}" />`;
|
||||
}
|
||||
|
||||
let append_desc_html = `<br/><a href="${link.url}">[link]</a> <a href="${link.permalink}">[comments]</a>`
|
||||
let append_desc_html = `<br/><a href="${link.url}">[link]</a> <a href="${link.permalink}">[comments]</a>`;
|
||||
|
||||
items += `
|
||||
<item>
|
||||
<title>${link.title}</title>
|
||||
<author>${link.author}</author>
|
||||
<created>${link.created}</created>
|
||||
<pubDate>${new Date(link.created_utc*1000).toGMTString()}</pubDate>
|
||||
<pubDate>${new Date(
|
||||
link.created_utc * 1000
|
||||
).toGMTString()}</pubDate>
|
||||
<domain>${link.domain}</domain>
|
||||
<id>${link.id}</id>
|
||||
<thumbnail>${thumbnail}</thumbnail>
|
||||
${enclosure}
|
||||
<link>${link.permalink}</link>
|
||||
<url>${link.url}</url>
|
||||
<description><![CDATA[${unescape(link.selftext_html)}${append_desc_html}]]></description>
|
||||
<description><![CDATA[${unescape(
|
||||
link.selftext_html
|
||||
)}${append_desc_html}]]></description>
|
||||
<num_comments>${link.num_comments}</num_comments>
|
||||
<ups>${link.ups}</ups>
|
||||
<stickied>${link.stickied}</stickied>
|
||||
<is_self_link>${is_self_link}</is_self_link>
|
||||
</item>
|
||||
`
|
||||
`;
|
||||
}
|
||||
|
||||
let r_subreddit = '/r/' + subreddit
|
||||
let title = r_subreddit
|
||||
let link = `${protocol}://${config.domain}${r_subreddit}`
|
||||
let r_subreddit = '/r/' + subreddit;
|
||||
let title = r_subreddit;
|
||||
let link = `${protocol}://${config.domain}${r_subreddit}`;
|
||||
if (subreddit === '/') {
|
||||
r_subreddit = 'frontpage'
|
||||
title = 'teddit frontpage'
|
||||
link = `${protocol}://${config.domain}`
|
||||
r_subreddit = 'frontpage';
|
||||
title = 'teddit frontpage';
|
||||
link = `${protocol}://${config.domain}`;
|
||||
}
|
||||
|
||||
let xml_output =
|
||||
`<?xml version="1.0" encoding="UTF-8"?>
|
||||
let xml_output = `<?xml version="1.0" encoding="UTF-8"?>
|
||||
<rss xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/" version="2.0">
|
||||
<channel>
|
||||
<atom:link href="${link}/?api&type=rss" rel="self" type="application/rss+xml" />
|
||||
|
|
@ -117,50 +133,57 @@ module.exports = function() {
|
|||
<description>Subreddit feed for: ${r_subreddit}</description>
|
||||
${items}
|
||||
</channel>
|
||||
</rss>`
|
||||
res.setHeader('Content-Type', 'application/rss+xml')
|
||||
return res.end(xml_output)
|
||||
</rss>`;
|
||||
res.setHeader('Content-Type', 'application/rss+xml');
|
||||
return res.end(xml_output);
|
||||
} else {
|
||||
res.setHeader('Content-Type', 'application/json')
|
||||
res.setHeader('Content-Type', 'application/json');
|
||||
if (api_target === 'reddit') {
|
||||
return res.end(JSON.stringify(json))
|
||||
return res.end(JSON.stringify(json));
|
||||
} else {
|
||||
let processed_json = await processJsonSubreddit(_json, from, null, req.cookies)
|
||||
let processed_json = await processJsonSubreddit(
|
||||
_json,
|
||||
from,
|
||||
null,
|
||||
req.cookies
|
||||
);
|
||||
|
||||
let protocol = (config.https_enabled ? 'https' : 'http')
|
||||
let protocol = config.https_enabled ? 'https' : 'http';
|
||||
for (var i = 0; i < processed_json.links.length; i++) {
|
||||
let link = processed_json.links[i]
|
||||
let valid_reddit_self_domains = ['reddit.com']
|
||||
let is_self_link = false
|
||||
let link = processed_json.links[i];
|
||||
let valid_reddit_self_domains = ['reddit.com'];
|
||||
let is_self_link = false;
|
||||
|
||||
if (link.domain) {
|
||||
let tld = link.domain.split('self.')
|
||||
let tld = link.domain.split('self.');
|
||||
if (tld.length > 1) {
|
||||
if (!tld[1].includes('.')) {
|
||||
is_self_link = true
|
||||
link.url = teddifyUrl(link.url)
|
||||
is_self_link = true;
|
||||
link.url = teddifyUrl(link.url);
|
||||
}
|
||||
}
|
||||
if(config.valid_media_domains.includes(link.domain) || valid_reddit_self_domains.includes(link.domain)) {
|
||||
is_self_link = true
|
||||
link.url = teddifyUrl(link.url)
|
||||
if (
|
||||
config.valid_media_domains.includes(link.domain) ||
|
||||
valid_reddit_self_domains.includes(link.domain)
|
||||
) {
|
||||
is_self_link = true;
|
||||
link.url = teddifyUrl(link.url);
|
||||
}
|
||||
}
|
||||
|
||||
link.permalink = `${protocol}://${config.domain}${link.permalink}`
|
||||
link.permalink = `${protocol}://${config.domain}${link.permalink}`;
|
||||
|
||||
if(is_self_link)
|
||||
link.url = link.permalink
|
||||
if (is_self_link) link.url = link.permalink;
|
||||
|
||||
if (link.images) {
|
||||
if (link.images.thumb !== 'self') {
|
||||
link.images.thumb = `${protocol}://${config.domain}${link.images.thumb}`
|
||||
link.images.thumb = `${protocol}://${config.domain}${link.images.thumb}`;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return res.end(JSON.stringify(processed_json))
|
||||
}
|
||||
}
|
||||
return res.end(JSON.stringify(processed_json));
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ const config = require('../config');
|
|||
const { redis, fetch } = require('../app');
|
||||
const homeRoute = require('express').Router();
|
||||
|
||||
const processSubreddit = require('../inc/processJsonSubreddit.js')();
|
||||
const processJsonSubreddit = require('../inc/processJsonSubreddit.js');
|
||||
const tedditApiSubreddit = require('../inc/teddit_api/handleSubreddit.js')();
|
||||
const processMoreComments = require('../inc/processMoreComments.js')();
|
||||
const processSubredditsExplore =
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ const config = require('../config');
|
|||
const { redis, fetch } = require('../app');
|
||||
const saveRoutes = require('express').Router();
|
||||
|
||||
const processSubreddit = require('../inc/processJsonSubreddit.js')();
|
||||
const processJsonSubreddit = require('../inc/processJsonSubreddit.js');
|
||||
const tedditApiSubreddit = require('../inc/teddit_api/handleSubreddit.js')();
|
||||
const processMoreComments = require('../inc/processMoreComments.js')();
|
||||
const processSubredditsExplore =
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ const {
|
|||
} = require('../inc/processJsonPost.js');
|
||||
const processSubredditAbout = require('../inc/processSubredditAbout.js');
|
||||
const processSearchResults = require('../inc/processSearchResults.js');
|
||||
const processSubreddit = require('../inc/processJsonSubreddit.js')();
|
||||
const processJsonSubreddit = require('../inc/processJsonSubreddit.js');
|
||||
const tedditApiSubreddit = require('../inc/teddit_api/handleSubreddit.js')();
|
||||
const processMoreComments = require('../inc/processMoreComments.js')();
|
||||
const processSubredditsExplore =
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ const userRoutes = require('express').Router();
|
|||
|
||||
const processJsonUser = require('../inc/processJsonUser.js');
|
||||
const tedditApiUser = require('../inc/teddit_api/handleUser.js')();
|
||||
const processSubreddit = require('../inc/processJsonSubreddit.js')();
|
||||
const processJsonSubreddit = require('../inc/processJsonSubreddit.js');
|
||||
const tedditApiSubreddit = require('../inc/teddit_api/handleSubreddit.js')();
|
||||
const processMoreComments = require('../inc/processMoreComments.js')();
|
||||
const processSubredditsExplore =
|
||||
|
|
|
|||
Loading…
Reference in New Issue