From 8fb929399e0c7a7c622850ac87f36285968934b5 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Tue, 19 Apr 2022 17:04:36 +0300 Subject: [PATCH] Fixed sub_frame or instagram #166 --- src/assets/javascripts/helpers/instagram.js | 11 ++++++++++- src/assets/javascripts/helpers/tiktok.js | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/assets/javascripts/helpers/instagram.js b/src/assets/javascripts/helpers/instagram.js index 3528575d..f007fac3 100644 --- a/src/assets/javascripts/helpers/instagram.js +++ b/src/assets/javascripts/helpers/instagram.js @@ -105,7 +105,16 @@ function redirect(url, type, initiator) { if (!targets.includes(url.host)) return; - if (type !== "main_frame" || bypassPaths.some(rx => rx.test(url.pathname))) return; + if (![ + "main_frame", + "sub_frame", + "xmlhttprequest", + "other", + "image", + "media", + ].includes(type)) return null; + + if (bypassPaths.some(rx => rx.test(url.pathname))) return; let instancesList; if (protocol == 'normal') instancesList = [...bibliogramNormalRedirectsChecks, ...bibliogramNormalCustomRedirects]; diff --git a/src/assets/javascripts/helpers/tiktok.js b/src/assets/javascripts/helpers/tiktok.js index 494b57a8..fbadc2af 100644 --- a/src/assets/javascripts/helpers/tiktok.js +++ b/src/assets/javascripts/helpers/tiktok.js @@ -108,7 +108,7 @@ function redirect(url, type) { if (instancesList.length === 0) return null; let randomInstance = commonHelper.getRandomInstance(instancesList); - let pathName = url.pathname.replace(/@.*\/(?=video)/, ""); + // let pathName = url.pathname.replace(/@.*\/(?=video)/, ""); return `${randomInstance}${url.pathname}`; }