Merge branch 'main' into main

inc/initRedditApi.js

@@ -73,7 +73,7 @@ module.exports = function(fetch) {
     })
   }
   this.redditApiGETHeaders = function() {
-    let cookies = '_options=%7B%22pref_quarantine_optin%22%3A%20true%7D'
+    let cookies = `edgebucket=; _options={%22pref_gated_sr_optin%22:true,%22pref_quarantine_optin%22:true}`
     
     if(!config.use_reddit_oauth)
       return { headers: { cookie: cookies }, method: 'GET' }

inc/processJsonPost.js

@@ -1,5 +1,6 @@
 const compilePostComments = require('./compilePostComments.js')();
 const procPostMedia = require('./processPostMedia.js')();
+const config = require('../config');
 
 async function processReplies(data, post_id, depth, user_preferences) {
   let return_replies = [];
@@ -399,8 +400,141 @@ async function finalizeJsonPost(
   return { post_data: post_data, comments: comments_html };
 }
 
+async function processJsonPostList(posts, mode) {
+  let protocol = config.https_enabled || config.api_force_https ? 'https' : 'http';
+
+  for (var i = 0; i < posts.length; i++) {
+    let link = posts[i];
+    let valid_reddit_self_domains = ['reddit.com'];
+    let is_self_link = false;
+
+    if (link.domain) {
+      let tld = link.domain.split('self.');
+      if (tld.length > 1) {
+        if (!tld[1].includes('.')) {
+          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}`;
+
+    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}`;
+      }
+    }
+
+    if (mode === 'light') {
+      link.selftext_html = null;
+    }
+  }
+
+  return posts;
+}
+
+async function getPostItem(post_json, req, protocol) {
+  let thumbnail = '';
+  let post_image = '';
+  let is_self_link = false;
+  let valid_reddit_self_domains = ['reddit.com'];
+
+  if (post_json.domain) {
+    let tld = post_json.domain.split('self.');
+    if (tld.length > 1) {
+      if (!tld[1].includes('.')) {
+        is_self_link = true;
+        post_json.url = teddifyUrl(post_json.url);
+      }
+    }
+    if (
+      config.valid_media_domains.includes(post_json.domain) ||
+      valid_reddit_self_domains.includes(post_json.domain)
+    ) {
+      is_self_link = true;
+      post_json.url = teddifyUrl(post_json.url);
+    }
+  }
+
+  if (post_json.preview && post_json.thumbnail !== 'self') {
+    if (!post_json.url.startsWith('/r/') && isGif(post_json.url)) {
+      let s = await downloadAndSave(post_json.thumbnail, 'thumb_');
+      thumbnail = `${protocol}://${config.domain}${s}`;
+    } else {
+      if (post_json.preview.images[0].resolutions[0]) {
+        let s = await downloadAndSave(
+          post_json.preview.images[0].resolutions[0].url,
+          'thumb_'
+        );
+        thumbnail = `${protocol}://${config.domain}${s}`;
+        if (!isGif(post_json.url) && !post_json.post_hint.includes(':video')) {
+          s = await downloadAndSave(post_json.preview.images[0].source.url);
+          post_image = `${protocol}://${config.domain}${s}`;
+        }
+      }
+    }
+  }
+
+  post_json.permalink = `${protocol}://${config.domain}${post_json.permalink}`;
+
+  if (is_self_link) post_json.url = post_json.permalink;
+
+  if (req.query.hasOwnProperty('full_thumbs')) {
+    if (!post_image) post_image = thumbnail;
+
+    thumbnail = post_image;
+  }
+
+  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 append_desc_html = `<br/><a href="${post_json.url}">[link]</a> <a href="${post_json.permalink}">[comments]</a>`;
+
+  return `
+    <item>
+      <title>${post_json.title}</title>
+      <author>${post_json.author}</author>
+      <created>${post_json.created}</created>
+      <pubDate>${new Date(
+        post_json.created_utc * 1000
+      ).toGMTString()}</pubDate>
+      <domain>${post_json.domain}</domain>
+      <id>${post_json.id}</id>
+      <thumbnail>${thumbnail}</thumbnail>
+      ${enclosure}
+      <link>${post_json.permalink}</link>
+      <url>${post_json.url}</url>
+      <description><![CDATA[${unescape(
+        post_json.selftext_html
+      )}${append_desc_html}]]></description>
+      <num_comments>${post_json.num_comments}</num_comments>
+      <ups>${post_json.ups}</ups>
+      <stickied>${post_json.stickied}</stickied>
+      <is_self_link>${is_self_link}</is_self_link>
+    </item>
+  `;
+}
+
 module.exports = {
   processReplies,
   processJsonPost,
   finalizeJsonPost,
+  processJsonPostList,
+  getPostItem
 };

inc/processSubredditAbout.js

@@ -64,4 +64,15 @@ async function processSubredditAbout(subreddit, redis, fetch, RedditAPI) {
   }
 }
 
-module.exports = processSubredditAbout;
+async function processJsonSubredditAbout(json, parsed) {
+  if (!parsed) {
+    json = JSON.parse(json);
+  }
+
+  return returnRelevantKeys(json);
+}
+
+module.exports = {
+  processSubredditAbout,
+  processJsonSubredditAbout
+};

inc/teddit_api/handlePost.js

@@ -0,0 +1,87 @@
+const { processJsonPost, getPostItem } = require('../processJsonPost');
+
+module.exports = function () {
+  const config = require('../../config');
+  this.handleTedditApiPost = async (
+    json,
+    req,
+    res,
+    from,
+    api_type,
+    api_target
+  ) => {
+    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 - post');
+    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 post = json[0].data.children[0].data;
+      let comments = json[1].data.children;
+
+      items += await getPostItem(post, req, protocol);
+
+      for (var i = 0; i < comments.length; i++) {
+        let comment = comments[i].data;
+        let kind = comments[i].kind;
+
+        let title = `/u/${comment.author} on ${post.title}`;
+        
+        comment.permalink = `${protocol}://${config.domain}${comment.permalink}`;
+
+        if (kind !== 'more') {
+          items += `
+            <item>
+              <title>${title}</title>
+              <author>${comment.author}</author>
+              <created>${comment.created}</created>
+              <pubDate>${new Date(
+                comment.created_utc * 1000
+              ).toGMTString()}</pubDate>
+              <id>${comment.id}</id>
+              <link>${comment.permalink}</link>
+              <description><![CDATA[${unescape(
+                comment.body_html
+              )}]]></description>
+              <ups>${comment.ups}</ups>
+            </item>
+          `;
+        }
+      }
+
+      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="${post.permalink}?api&amp;type=rss" rel="self" type="application/rss+xml" />
+            <title>${post.title}</title>
+            <link>${post.url}</link>
+            ${items}
+          </channel>
+        </rss>`;
+      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 processJsonPost(
+          json,
+          true,
+          req.cookies
+        );
+
+        return res.end(JSON.stringify(processed_json));
+      }
+    }
+  };
+};

inc/teddit_api/handleSubreddit.js

@@ -1,4 +1,8 @@
 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');
@@ -27,93 +31,10 @@ module.exports = function () {
     if (api_type === 'rss') {
       let protocol = config.https_enabled || config.api_force_https ? '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'];
-
-        if (link.domain) {
-          let tld = link.domain.split('self.');
-          if (tld.length > 1) {
-            if (!tld[1].includes('.')) {
-              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}`;
-          } 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}`;
-              if (!isGif(link.url) && !link.post_hint.includes(':video')) {
-                s = await downloadAndSave(link.preview.images[0].source.url);
-                post_image = `${protocol}://${config.domain}${s}`;
-              }
-            }
-          }
-        }
-
-        link.permalink = `${protocol}://${config.domain}${link.permalink}`;
-
-        if (is_self_link) link.url = link.permalink;
-
-        if (req.query.hasOwnProperty('full_thumbs')) {
-          if (!post_image) post_image = thumbnail;
-
-          thumbnail = post_image;
-        }
-
-        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 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>
-            <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>
-            <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 post = json.data.children[i].data;
+        items += await getPostItem(post, req, protocol);
       }
 
       let r_subreddit = '/r/' + subreddit;
@@ -149,43 +70,185 @@ module.exports = function () {
           req.cookies
         );
 
-        let protocol = config.https_enabled || config.api_force_https ? '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;
+        await processJsonPostList(processed_json.links, mode);
 
-          if (link.domain) {
-            let tld = link.domain.split('self.');
-            if (tld.length > 1) {
-              if (!tld[1].includes('.')) {
-                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);
-            }
-          }
+        return res.end(JSON.stringify(processed_json));
+      }
+    }
+  };
+  this.handleTedditApiSubredditAbout = async (
+    json,
+    res,
+    from,
+    api_target
+  ) => {
+    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));
+    }
 
-          link.permalink = `${protocol}://${config.domain}${link.permalink}`;
+    console.log('Teddit API request - subreddit about');
+    if (from === 'redis') json = JSON.parse(json);
 
-          if (is_self_link) link.url = link.permalink;
+    res.setHeader('Content-Type', 'application/json');
 
-          if (link.images) {
-            if (link.images.thumb !== 'self') {
-              link.images.thumb = `${protocol}://${config.domain}${link.images.thumb}`;
-            }
-          }
+    if (api_target === 'reddit') {
+      return res.end(JSON.stringify(json));
+    } else {
+      let subreddit_about = await processJsonSubredditAbout(
+        json,
+        true
+      );
 
-          if (mode === 'light') {
-            link.selftext_html = null;
-          }
-        }
+      return res.end(JSON.stringify(subreddit_about));
+    }
+  };
+  this.handleTedditApiSubredditSearch = async (
+    json,
+    req,
+    res,
+    from,
+    api_type,
+    api_target,
+    subreddit,
+    query,
+    mode
+  ) => {
+    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 search');
+    if (from === 'redis') json = JSON.parse(json);
+
+    if (api_type === 'rss') {
+      let protocol = config.https_enabled || config.api_force_https ? 'https' : 'http';
+      let items = '';
+
+      for (var i = 0; i < json.data.children.length; i++) {
+        let post = json.data.children[i].data;
+        items += await getPostItem(post, req, protocol);
+      }
+
+      let r_subreddit = '/r/' + subreddit;
+      let title = `${query} - ${r_subreddit}`;
+      let link = `${protocol}://${config.domain}${r_subreddit}/search?q=${query}`;
+
+      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}&amp;api&amp;type=rss" rel="self" type="application/rss+xml" />
+            <title>${title}</title>
+            <link>${link}</link>
+            <description>Results for: ${query} - ${r_subreddit}</description>
+            ${items}
+          </channel>
+        </rss>`;
+
+      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 processSearchResults(
+          json,
+          true,
+          null,
+          null,
+          req.cookies
+        );
+
+        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 += `
+          <item>
+            <title>${data.title}</title>
+            <created>${data.created}</created>
+            <pubDate>${new Date(
+              data.created_utc * 1000
+            ).toGMTString()}</pubDate>
+            <id>${data.id}</id>
+            <name>${data.display_name}</name>
+            <name_prefixed>${data.display_name_prefixed}</name_prefixed>
+            <url>${replaceDomains(data.url, req.cookies)}</url>
+            <description><![CDATA[${unescape(
+              data.public_description_html
+            )}]]></description>
+            <subscribers>${data.subscribers}</subscribers>
+            <over_18>${data.over18}</over_18>
+          </item>
+        `;
+      }
+      
+      let title = `${query}`;
+      let link = `${protocol}://${config.domain}/subreddits/search?q=${query}`;
+
+      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}&amp;api&amp;type=rss" rel="self" type="application/rss+xml" />
+            <title>${title}</title>
+            <link>${link}</link>
+            <description>Results for: ${query}</description>
+            ${items}
+          </channel>
+        </rss>`;
+      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));
       }