Merge branch 'main' into main

Dockerfile

@@ -6,8 +6,10 @@ RUN apk add ffmpeg
 
 # Install NPM dependencies and copy the project
 WORKDIR /teddit
-COPY . /teddit/
+COPY . ./
 RUN npm install --no-optional
-COPY config.js.template /teddit/config.js
+COPY config.js.template ./config.js
+
+RUN find ./static/ -type d -exec chmod -R 777 {} \;
 
 CMD npm start

app.js

@@ -7,7 +7,6 @@ global.ratelimit_counts = {}
 global.ratelimit_timestamps = {}
 
 const pug = require('pug')
-const path = require('path')
 const compression = require('compression')
 const express = require('express')
 const cookieParser = require('cookie-parser')
@@ -53,7 +52,12 @@ const fs = require('fs')
 const app = express()
 const request = require('postman-request')
 const commons = require('./inc/commons.js')(request, fs)
-const dlAndSave = require('./inc/downloadAndSave.js')(commons)
+const dlAndSave = require('./inc/downloadAndSave.js')(commons);
+
+['pics/thumbs', 'pics/flairs', 'pics/icons', 'vids']
+  .map(d => `./static/${d}`)
+  .filter(d => !fs.existsSync(d))
+  .forEach(d => fs.mkdirSync(d, { recursive: true }))
 
 if(!config.https_enabled && config.redirect_http_to_https) {
   console.error(`Cannot redirect HTTP=>HTTPS while "https_enabled" is false.`)

inc/commons.js

@@ -20,7 +20,7 @@ module.exports = function(request, fs) {
         if(!error) {
           resolve({ success: true })
         } else {
-          resolve({ success: false })
+          resolve({ success: false, error })
         }
       })
     }).catch((err) => {

inc/downloadAndSave.js

@@ -89,7 +89,7 @@ module.exports = function(tools) {
                               let temp_files = [temp_path, audio_path]
                               deleteFiles(temp_files, (error) => {
                                 if(error) {
-                                  console.log(`Error while deleting temporay files:`, error)
+                                  console.log(`Error while deleting temporary files:`, error)
                                 }
                               })
                               resolve(final_url)

inc/processJsonPost.js

@@ -76,13 +76,13 @@ module.exports = function(fetch) {
           }
         }
 
-        obj = await processPostMedia(obj, post, post.media, has_gif, reddit_video, gif_to_mp4)
+        obj = await processPostMedia(obj, post, post.media, has_gif, reddit_video, gif_to_mp4, user_preferences)
 
         if(post.crosspost_parent_list) {
           post.crosspost = post.crosspost_parent_list[0]
         }
         if(post.crosspost) {
-          obj = await processPostMedia(obj, post.crosspost, post.crosspost.media, has_gif, reddit_video, gif_to_mp4)
+          obj = await processPostMedia(obj, post.crosspost, post.crosspost.media, has_gif, reddit_video, gif_to_mp4, user_preferences)
           obj.crosspost = {
             author: post.crosspost.author,
             created: post.crosspost.created_utc,

inc/processPostMedia.js

@@ -1,6 +1,6 @@
 module.exports = function() {
   const config = require('../config')
-  this.processPostMedia = (obj, post, post_media, has_gif, reddit_video, gif_to_mp4) => {
+  this.processPostMedia = (obj, post, post_media, has_gif, reddit_video, gif_to_mp4, user_preferences) => {
     return new Promise(resolve => {
       (async () => {
         if(post_media || has_gif) {
@@ -24,7 +24,7 @@ module.exports = function() {
                   width: post_media.oembed.thumbnail_width,
                   thumbnail: await downloadAndSave(post_media.oembed.thumbnail_url, '', false, true),
                   author_name: post_media.oembed.author_name,
-                  author_url: post_media.oembed.author_url,
+                  author_url: replaceDomains(post_media.oembed.author_url, user_preferences),
                   title: post_media.oembed.title,
                   duration: null,
                   is_gif: null,
@@ -37,9 +37,8 @@ module.exports = function() {
                   let r = /iframe.*?src=\"(.*?)\"/;
                   let src = r.exec(str)[1]
                   let youtube_id = src.split('/embed/')[1].split('?')[0]
-                  // TODO: Invidious youtube URLs.
                   let youtube_url = `https://youtube.com/watch?v=${youtube_id}`
-                  obj.media.embed_src = youtube_url
+                  obj.media.embed_src = replaceDomains(youtube_url, user_preferences)
                 } catch(error) {
                   console.error(`Error while trying to get src link from embed youtube html.`, error)
                 }
@@ -67,7 +66,7 @@ module.exports = function() {
                     source: 'external',
                     height: post_media.oembed.height,
                     width: post_media.oembed.width,
-                    provider_url: post_media.oembed.provider_url,
+                    provider_url: replaceDomains(post_media.oembed.provider_url, user_preferences),
                     provider_name: post_media.oembed.provider_name,
                     title: post_media.oembed.title,
                     duration: null,
@@ -79,12 +78,12 @@ module.exports = function() {
                     let str = post_media.oembed.html
                     let r = /iframe.*?src=\"(.*?)\"/;
                     let src = r.exec(str)[1]
-                    obj.media.embed_src = cleanUrl(src)
+                    obj.media.embed_src = replaceDomains(cleanUrl(src), user_preferences)
                   } catch(error) {
                     //console.error(`Error while trying to get src link from embed html.`, error)
                   }
                   if(!obj.media.embed_src) {
-                    obj.media.embed_src = post_media.oembed.url
+                    obj.media.embed_src = replaceDomains(post_media.oembed.url, user_preferences)
                   }
                 }
               }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "teddit",
-  "version": "0.2.2",
+  "version": "0.3.1",
   "description": "A free and open source alternative Reddit front-end focused on privacy.",
   "homepage": "https://teddit.net",
   "bugs": {

views/about.pug

@@ -21,5 +21,5 @@ html
         .bottom
           a(href="https://en.wikipedia.org/wiki/Piratbyr%C3%A5n#Kopimi", target="_blank")
             img(src="kopimi.gif")
-          p.version v.0.2.2
+          p.version v.0.3.1
     include includes/footer.pug