devol
/
libredirect
mirror of https://codeberg.org/LibRedirect/libredirect.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

completing on fixing reddit option page bug

This commit is contained in:
ManeraKai 2022-02-13 23:04:29 +03:00
parent 1f2fa608d7
commit 1162fba641
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/assets/javascripts/helpers/reddit.js
View File

@ -3,6 +3,7 @@ window.browser = window.browser || window.chrome;
import commonHelper from './common.js' import commonHelper from './common.js'
const targets = [ const targets = [
"reddit.com",
"www.reddit.com", "www.reddit.com",
"np.reddit.com", "np.reddit.com",
"new.reddit.com", "new.reddit.com",
@ -146,8 +147,7 @@ function setRedditFrontend(val) {
function redirect(url, initiator, type) { function redirect(url, initiator, type) {
if (disableReddit) if (disableReddit) return null;
return null;
// Do not redirect when already on the selected view // Do not redirect when already on the selected view
// if ((initiator && initiator.origin === redditInstance) || url.origin === redditInstance) // if ((initiator && initiator.origin === redditInstance) || url.origin === redditInstance)
@ -158,24 +158,30 @@ function redirect(url, initiator, type) {
if (type !== "main_frame" || url.pathname.match(bypassPaths)) if (type !== "main_frame" || url.pathname.match(bypassPaths))
return null; return null;
let libreddtInstancesList = [...libredditRedirectsChecks, ...libredditCustomRedirects]; let libredditInstancesList = [...libredditRedirectsChecks, ...libredditCustomRedirects];
if (libreddtInstancesList.length === 0) return null;
let libredditRandomInstance = commonHelper.getRandomInstance(libreddtInstancesList);
let tedditInstancesList = [...tedditRedirectsChecks, ...tedditCustomRedirects]; let tedditInstancesList = [...tedditRedirectsChecks, ...tedditCustomRedirects];
if (tedditInstancesList.length === 0) return null;
let tedditRandomInstance = commonHelper.getRandomInstance(tedditInstancesList);
if (url.host === "i.redd.it")
if (url.host === "i.redd.it") {
if (libredditInstancesList.length === 0) return null;
let libredditRandomInstance = commonHelper.getRandomInstance(libredditInstancesList);
// As of 2021-04-09, redirects for teddit images are nontrivial: // As of 2021-04-09, redirects for teddit images are nontrivial:
// - navigating to the image before ever navigating to its page causes // - navigating to the image before ever navigating to its page causes
// 404 error (probably needs fix on teddit project) // 404 error (probably needs fix on teddit project)
// - some image links on teddit are very different // - some image links on teddit are very different
// Therefore, don't support redirecting image links for teddit. // Therefore, don't support redirecting image links for teddit.
return `${libredditRandomInstance}/img${url.pathname}${url.search}`; return `${libredditRandomInstance}/img${url.pathname}${url.search}`;
}
else if (url.host === "redd.it") { else if (url.host === "redd.it") {
if (redditFrontend == 'libreddit') return `${libredditRandomInstance}${url.pathname}${url.search}`; if (redditFrontend == 'libreddit') {
if (redditFrontend == 'teddit' && !url.pathname.match(/^\/+[^\/]+\/+[^\/]/)) if (libredditInstancesList.length === 0) return null;
let libredditRandomInstance = commonHelper.getRandomInstance(libredditInstancesList);
return `${libredditRandomInstance}${url.pathname}${url.search}`;
}
if (redditFrontend == 'teddit' && !url.pathname.match(/^\/+[^\/]+\/+[^\/]/)) {
if (tedditInstancesList.length === 0) return null;
let tedditRandomInstance = commonHelper.getRandomInstance(tedditInstancesList);
// As of 2021-04-22, redirects for teddit redd.it/foo links don't work. // As of 2021-04-22, redirects for teddit redd.it/foo links don't work.
// It appears that adding "/comments" as a prefix works, so manually add // It appears that adding "/comments" as a prefix works, so manually add
// that prefix if it is missing. Even though redd.it/comments/foo links // that prefix if it is missing. Even though redd.it/comments/foo links
@ -185,8 +191,19 @@ function redirect(url, initiator, type) {
// teddit.net/comments/foo (works). // teddit.net/comments/foo (works).
return `${tedditRandomInstance}/comments${url.pathname}${url.search}`; return `${tedditRandomInstance}/comments${url.pathname}${url.search}`;
} }
if (redditFrontend == 'libreddit') return `${libredditRandomInstance}${url.pathname}${url.search}`; }
if (redditFrontend == 'teddit') return `${tedditRandomInstance}${url.pathname}${url.search}`; if (redditFrontend == 'libreddit') {
if (libredditInstancesList.length === 0) return null;
let libredditRandomInstance = commonHelper.getRandomInstance(libredditInstancesList);
return `${libredditRandomInstance}${url.pathname}${url.search}`;
}
if (redditFrontend == 'teddit') {
if (tedditInstancesList.length === 0) return null;
let tedditRandomInstance = commonHelper.getRandomInstance(tedditInstancesList);
return `${tedditRandomInstance}${url.pathname}${url.search}`;
}
} }
function isReddit(url) { function isReddit(url) {