Skip to content

Commit

Permalink
We are NOT Universal Bypass anymore (#627)
Browse files Browse the repository at this point in the history
  • Loading branch information
reashetyrr authored Jul 26, 2022
1 parent e043d78 commit 6f64a72
Show file tree
Hide file tree
Showing 6 changed files with 321 additions and 321 deletions.
76 changes: 38 additions & 38 deletions src/html/before-navigate.js
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
const args=new URLSearchParams(location.search)
if(args.has("target"))
{
let span=document.querySelector("[data-message='beforeNavigateDestination']")
span.innerHTML=span.innerHTML.replace("%",'<a href="#"></a>')
const a=span.querySelector("a"),referer=args.get("referer")
a.textContent=args.get("target")
const when_safe=()=>{
document.getElementById("unsafe").classList.add("uk-hidden")
a.href=referer&&referer!="tracker"?"https://universal-bypass.org/navigate"+location.search:args.get("target")
brws.storage.sync.get(["navigation_delay","no_instant_navigation_trackers"],res=>{
if(res.navigation_delay==0||(referer=="tracker"&&res.no_instant_navigation_trackers!=="true"))
{
document.querySelector("div").innerHTML="<p></p>"
document.querySelector("p").textContent=brws.i18n.getMessage("beforeNavigateInstant").replace("%",args.get("target"))
setTimeout(()=>location.href=a.href,10)
}
else
{
timer("beforeNavigateTimer",res.navigation_delay,true,()=>location.href=a.href)
}
})
}
if(args.has("safe_in"))
{
document.getElementById("unsafe").classList.remove("uk-hidden")
document.getElementById("options-link").classList.add("uk-hidden")
timer("beforeNavigateUnsafeTimer",args.get("safe_in"),false,when_safe)
}
else
{
when_safe()
}
}
else
{
history.back()
}
const args=new URLSearchParams(location.search)
if(args.has("target"))
{
let span=document.querySelector("[data-message='beforeNavigateDestination']")
span.innerHTML=span.innerHTML.replace("%",'<a href="#"></a>')
const a=span.querySelector("a"),referer=args.get("referer")
a.textContent=args.get("target")
const when_safe=()=>{
document.getElementById("unsafe").classList.add("uk-hidden")
a.href=referer&&referer!="tracker"?"https://fastforward.team/navigate"+location.search:args.get("target")
brws.storage.sync.get(["navigation_delay","no_instant_navigation_trackers"],res=>{
if(res.navigation_delay==0||(referer=="tracker"&&res.no_instant_navigation_trackers!=="true"))
{
document.querySelector("div").innerHTML="<p></p>"
document.querySelector("p").textContent=brws.i18n.getMessage("beforeNavigateInstant").replace("%",args.get("target"))
setTimeout(()=>location.href=a.href,10)
}
else
{
timer("beforeNavigateTimer",res.navigation_delay,true,()=>location.href=a.href)
}
})
}
if(args.has("safe_in"))
{
document.getElementById("unsafe").classList.remove("uk-hidden")
document.getElementById("options-link").classList.add("uk-hidden")
timer("beforeNavigateUnsafeTimer",args.get("safe_in"),false,when_safe)
}
else
{
when_safe()
}
}
else
{
history.back()
}
56 changes: 28 additions & 28 deletions src/html/crowd-bypassed.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
const args=new URLSearchParams(location.search)
if(args.has("target")&&args.has("referer"))
{
let span=document.querySelector('[data-message="crowdBypassedInfo"]'),opentimer
span.innerHTML=span.innerHTML.replace("%",'<a target="_blank"></a>')
const a=span.querySelector("a"),
closetimer=()=>brws.storage.sync.get(["crowd_close_delay"],res=>timer("crowdCloseTimer",res.crowd_close_delay,true,()=>{
brws.runtime.sendMessage({type: "close-tab"})
}))
a.textContent=args.get("target")
a.href=args.has("referer")?"https://universal-bypass.org/navigate"+location.search:args.get("target")
a.onclick=()=>{
clearInterval(opentimer)
closetimer()
}
document.getElementById("ignore").href=args.get("referer")+"#ignoreCrowdBypass"
brws.storage.sync.get(["crowd_open_delay"],res=>opentimer=timer("crowdBypassedTimer",res.crowd_open_delay,true,()=>{
brws.runtime.sendMessage({
type: "open-tab",
url: a.href
})
closetimer()
}))
}
else
{
history.back()
}
const args=new URLSearchParams(location.search)
if(args.has("target")&&args.has("referer"))
{
let span=document.querySelector('[data-message="crowdBypassedInfo"]'),opentimer
span.innerHTML=span.innerHTML.replace("%",'<a target="_blank"></a>')
const a=span.querySelector("a"),
closetimer=()=>brws.storage.sync.get(["crowd_close_delay"],res=>timer("crowdCloseTimer",res.crowd_close_delay,true,()=>{
brws.runtime.sendMessage({type: "close-tab"})
}))
a.textContent=args.get("target")
a.href=args.has("referer")?"https://fastforward.team/navigate"+location.search:args.get("target")
a.onclick=()=>{
clearInterval(opentimer)
closetimer()
}
document.getElementById("ignore").href=args.get("referer")+"#ignoreCrowdBypass"
brws.storage.sync.get(["crowd_open_delay"],res=>opentimer=timer("crowdBypassedTimer",res.crowd_open_delay,true,()=>{
brws.runtime.sendMessage({
type: "open-tab",
url: a.href
})
closetimer()
}))
}
else
{
history.back()
}
14 changes: 7 additions & 7 deletions src/js/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,9 @@ refreshInjectionScript = () => {
if(enabled)
{
injectionScript = (upstreamInjectionScript + "\n" + userScript)
.split("UNIVERSAL_BYPASS_INTERNAL_VERSION").join("10")
.split("UNIVERSAL_BYPASS_EXTERNAL_VERSION").join(extension_version)
.split("UNIVERSAL_BYPASS_INJECTION_VERSION").join(upstreamCommit?upstreamCommit.substr(0,7):"dev")
.split("FAST_FORWARD_INTERNAL_VERSION").join("10")
.split("FAST_FORWARD_EXTERNAL_VERSION").join(extension_version)
.split("FAST_FORWARD_INJECTION_VERSION").join(upstreamCommit?upstreamCommit.substr(0,7):"dev")
Object.keys(preflightRules).forEach(name=>{
if(name in onBeforeRequest_rules)
{
Expand Down Expand Up @@ -479,16 +479,16 @@ brws.webRequest.onBeforeRequest.addListener(details=>{
safe_in=arr[1]
}
return encodedRedirect(url,decodeURIComponent(arr[0]),safe_in)
},{types:["main_frame"],urls:["*://universal-bypass.org/bypassed?target=*&referer=*"]},["blocking"])
},{types:["main_frame"],urls:["*://fastforward.team/bypassed?target=*&referer=*"]},["blocking"])

brws.webRequest.onBeforeRequest.addListener(details=>{
countIt()
return {redirectUrl:brws.runtime.getURL("html/crowd-bypassed.html")+details.url.substr(43)}
},{types:["main_frame"],urls:["https://universal-bypass.org/crowd-bypassed?*"]},["blocking"])
},{types:["main_frame"],urls:["https://fastforward.team/crowd-bypassed?*"]},["blocking"])

brws.webRequest.onBeforeRequest.addListener(details=>{
return {redirectUrl:brws.runtime.getURL("html/options.html")+details.url.substr(36)}
},{types:["main_frame"],urls:["https://universal-bypass.org/options*"]},["blocking"])
},{types:["main_frame"],urls:["https://fastforward.team/options*"]},["blocking"])

// Navigation handling including presenting referer header to destinations
var refererCache={}
Expand All @@ -500,7 +500,7 @@ brws.webRequest.onBeforeRequest.addListener(details=>{
refererCache[arr[0]]=decodeURIComponent(arr[1].split("&")[0])
}
return {redirectUrl:arr[0]}
},{types:["main_frame"],urls:["*://universal-bypass.org/navigate?target=*"]},["blocking"])
},{types:["main_frame"],urls:["*://fastforward.team/navigate?target=*"]},["blocking"])

let infoSpec=["blocking","requestHeaders"]
if("EXTRA_HEADERS" in brws.webRequest.OnBeforeSendHeadersOptions)
Expand Down
Loading

0 comments on commit 6f64a72

Please sign in to comment.