diff --git a/inc/commons.js b/inc/commons.js index e905f81..9abc040 100644 --- a/inc/commons.js +++ b/inc/commons.js @@ -35,12 +35,24 @@ module.exports = function(request, fs) { return url.replace(/&/g, '&') } - this.localizeUrl = (url, dir) => { - url = cleanUrl(url) - let temp_url = new URL(url) - if(!dir) - dir = '' - return url.replace(temp_url.origin, `${protocol}${domain}${dir}`) + this.teddifyUrl = (url) => { + try { + let u = new URL(url) + if(u.host === 'www.reddit.com' || u.host === 'reddit.com') { + url = url.replace(u.host, 'teddit.net') + } + if(u.host === 'i.redd.it' || u.host === 'v.redd.it') { + let image_exts = ['png', 'jpg', 'jpeg'] + let video_exts = ['mp4', 'gif', 'gifv'] + let file_ext = getFileExtension(url) + if(image_exts.includes(file_ext)) + url = url.replace(`${u.host}/`, 'teddit.net/pics/w:null_') + if(video_exts.includes(file_ext) || !image_exts.includes(file_ext)) + url = url.replace(u.host, 'teddit.net/vids') + '.mp4' + } + + } catch(e) { } + return url } this.kFormatter = (num) => { diff --git a/inc/processJsonPost.js b/inc/processJsonPost.js index 291fc04..a449953 100644 --- a/inc/processJsonPost.js +++ b/inc/processJsonPost.js @@ -20,9 +20,9 @@ module.exports = function(fetch) { locked: post.locked, name: post_id, num_comments: post.num_comments, - permalink: post.permalink, + permalink: teddifyUrl(post.permalink), title: post.title, - url: post.url, + url: teddifyUrl(post.url), ups: post.ups, id: post.id, domain: post.domain, @@ -79,7 +79,7 @@ module.exports = function(fetch) { name: post.crosspost.name, num_comments: post.crosspost.num_comments, id: post.crosspost.id, - permalink: post.crosspost.permalink, + permalink: teddifyUrl(post.crosspost.permalink), ups: post.crosspost.ups, selftext: unescape(post.selftext_html), selftext_crosspost: unescape(post.crosspost.selftext_html), @@ -136,7 +136,7 @@ module.exports = function(fetch) { score: comment.score, ups: comment.ups, id: comment.id, - permalink: comment.permalink, + permalink: teddifyUrl(comment.permalink), stickied: comment.stickied, distinguished: comment.distinguished, score_hidden: comment.score_hidden, @@ -212,7 +212,7 @@ module.exports = function(fetch) { score: reply.score, ups: reply.ups, id: reply.id, - permalink: reply.permalink, + permalink: teddifyUrl(reply.permalink), stickied: reply.stickied, distinguished: reply.distinguished, score_hidden: reply.score_hidden, @@ -247,7 +247,7 @@ module.exports = function(fetch) { score: comment.score, ups: comment.ups, id: comment.id, - permalink: comment.permalink, + permalink: teddifyUrl(comment.permalink), score_hidden: comment.score_hidden, distinguished: comment.distinguished, distinguished: comment.edited, diff --git a/views/includes/head.pug b/views/includes/head.pug index e10f553..39bd45e 100644 --- a/views/includes/head.pug +++ b/views/includes/head.pug @@ -69,26 +69,6 @@ meta(name="viewport", content="width=device-width, initial-scale=1.0") } } - function localize(url) { - try { - let u = new URL(url) - if(u.host === 'www.reddit.com' || u.host === 'reddit.com') { - url = url.replace(u.host, 'teddit.net') - } - if(u.host === 'i.redd.it' || u.host === 'v.redd.it') { - let image_exts = ['png', 'jpg', 'jpeg'] - let video_exts = ['mp4', 'gif', 'gifv'] - let file_ext = getFileExtension(url) - if(image_exts.includes(file_ext)) - url = url.replace(`${u.host}/`, 'teddit.net/pics/w:null_') - if(video_exts.includes(file_ext) || !image_exts.includes(file_ext)) - url = url.replace(u.host, 'teddit.net/vids') + '.mp4' - } - - } catch(e) { } - return url - } - function toDateString(time) { let d = new Date(); d.setTime(time*1000); diff --git a/views/post.pug b/views/post.pug index 094efaf..e4056f5 100644 --- a/views/post.pug +++ b/views/post.pug @@ -21,7 +21,7 @@ html span #{kFormatter(post.ups)} div.arrow.down .title - a(href="" + localize(post.url) + "") + a(href="" + post.url + "") h2 #{cleanTitle(post.title)} span(class="domain") (#{post.domain}) p.submitted @@ -31,7 +31,7 @@ html if post.crosspost.is_crosspost === true .crosspost .title - a(href="" + localize(post.crosspost.permalink) + "") + a(href="" + post.crosspost.permalink + "") h2 #{cleanTitle(post.crosspost.title)} span(class="domain") (#{post.domain}) .num_comments