about summary refs log tree commit diff stats
path: root/src/pages
diff options
context:
space:
mode:
Diffstat (limited to 'src/pages')
-rw-r--r--src/pages/background/background.js51
-rw-r--r--src/pages/background/incognito.html35
-rw-r--r--src/pages/background/incognito.js22
-rw-r--r--src/pages/options/index.html17
-rw-r--r--src/pages/options/index.pug2
-rw-r--r--src/pages/options/widgets/general.js39
-rw-r--r--src/pages/options/widgets/general.pug10
-rw-r--r--src/pages/popup/popup.html4
-rw-r--r--src/pages/popup/popup.pug2
-rw-r--r--src/pages/widgets/links.pug6
10 files changed, 62 insertions, 126 deletions
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 359a912d..c6e9ab7a 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -32,25 +32,27 @@ browser.runtime.onInstalled.addListener(details => {
 				browser.storage.local.clear(() => {
 					browser.storage.local.set({ cloudflareBlackList: JSON.parse(data).cloudflare }, () => {
 						browser.storage.local.set({ authenticateBlackList: JSON.parse(data).authenticate }, () => {
-							generalHelper.initDefaults()
-							youtubeHelper.initDefaults()
-							youtubeMusicHelper.initDefaults()
-							twitterHelper.initDefaults()
-							instagramHelper.initDefaults()
-							mapsHelper.initDefaults()
-							searchHelper.initDefaults()
-							translateHelper.initDefaults()
-							mediumHelper.initDefaults()
-							quoraHelper.initDefaults()
-							libremdbHelper.initDefaults()
-							reutersHelper.initDefaults()
-							redditHelper.initDefaults()
-							wikipediaHelper.initDefaults()
-							imgurHelper.initDefaults()
-							tiktokHelper.initDefaults()
-							sendTargetsHelper.initDefaults()
-							peertubeHelper.initDefaults()
-							lbryHelper.initDefaults()
+							browser.storage.local.set({ offlineBlackList: JSON.parse(data).offline }, () => {
+								generalHelper.initDefaults()
+								youtubeHelper.initDefaults()
+								youtubeMusicHelper.initDefaults()
+								twitterHelper.initDefaults()
+								instagramHelper.initDefaults()
+								mapsHelper.initDefaults()
+								searchHelper.initDefaults()
+								translateHelper.initDefaults()
+								mediumHelper.initDefaults()
+								quoraHelper.initDefaults()
+								libremdbHelper.initDefaults()
+								reutersHelper.initDefaults()
+								redditHelper.initDefaults()
+								wikipediaHelper.initDefaults()
+								imgurHelper.initDefaults()
+								tiktokHelper.initDefaults()
+								sendTargetsHelper.initDefaults()
+								peertubeHelper.initDefaults()
+								lbryHelper.initDefaults()
+							})
 						})
 					})
 				})
@@ -71,17 +73,6 @@ browser.runtime.onInstalled.addListener(details => {
 	// }
 })
 
-youtubeHelper.pasteInvidiousCookies()
-translateHelper.pasteSimplyTranslateCookies()
-twitterHelper.pasteNitterCookies()
-wikipediaHelper.pasteWikilessCookies()
-searchHelper.pasteSearxCookies()
-searchHelper.pasteSearxngCookies()
-searchHelper.pasteLibrexCookies()
-redditHelper.pasteLibredditCookies()
-redditHelper.pasteTedditCookies()
-tiktokHelper.pasteProxiTokCookies()
-
 let BYPASSTABs = []
 browser.webRequest.onBeforeRequest.addListener(
 	details => {
diff --git a/src/pages/background/incognito.html b/src/pages/background/incognito.html
deleted file mode 100644
index 227d99e4..00000000
--- a/src/pages/background/incognito.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8" />
-		<meta charset="UTF-8" />
-		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-		<meta name="viewport" content="width=device-width, initial-scale=1" />
-		<title data-localise="__MSG_instanceIsOff__">Initializing Cookies</title>
-		<link href="../stylesheets/styles.css" rel="stylesheet" />
-		<style>
-			body {
-				margin: 0;
-				padding: 0;
-				height: 100vh;
-				width: 100vw;
-				flex-wrap: wrap;
-				justify-content: center;
-				align-items: center;
-				font-size: 30px;
-				display: flex;
-			}
-
-			div {
-				text-align: center;
-			}
-		</style>
-	</head>
-
-	<body>
-		<div>
-			<p>Initializing Cookies...</p>
-		</div>
-		<script type="module" src="incognito.js"></script>
-	</body>
-</html>
diff --git a/src/pages/background/incognito.js b/src/pages/background/incognito.js
deleted file mode 100644
index c7ed2b7d..00000000
--- a/src/pages/background/incognito.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import youtubeHelper from "../../assets/javascripts/youtube/youtube.js"
-import twitterHelper from "../../assets/javascripts/twitter.js"
-import redditHelper from "../../assets/javascripts/reddit.js"
-import searchHelper from "../../assets/javascripts/search.js"
-import translateHelper from "../../assets/javascripts/translate/translate.js"
-import wikipediaHelper from "../../assets/javascripts/wikipedia.js"
-import tiktokHelper from "../../assets/javascripts/tiktok.js"
-
-window.browser = window.browser || window.chrome
-
-await youtubeHelper.pasteInvidiousCookies()
-await translateHelper.pasteSimplyTranslateCookies()
-await twitterHelper.pasteNitterCookies()
-await wikipediaHelper.pasteWikilessCookies()
-await searchHelper.pasteSearxCookies()
-await searchHelper.pasteSearxngCookies()
-await searchHelper.pasteLibrexCookies()
-await redditHelper.pasteLibredditCookies()
-await redditHelper.pasteTedditCookies()
-await tiktokHelper.pasteProxiTokCookies()
-
-window.close()
diff --git a/src/pages/options/index.html b/src/pages/options/index.html
index a868ad3a..077b3da2 100644
--- a/src/pages/options/index.html
+++ b/src/pages/options/index.html
@@ -21,7 +21,7 @@
           <div class="title"> <img src="../../../assets/images/instagram-icon.png"><a href="#instagram" data-localise="__MSG_instagram__">Instagram</a></div>
           <div class="title"> <img src="../../../assets/images/tiktok-icon.png"><a href="#tiktok" data-localise="__MSG_tiktok__">TikTok</a></div>
           <div class="title"> <img src="../../../assets/images/reddit-icon.png"><a href="#reddit" data-localise="__MSG_reddit__">Reddit</a></div>
-          <div class="title"> <img src="../../../assets/images/imgur-icon.png"><a href="#imgur" data-localise="__MSG_imgur__">Imgur</a></div>
+          <div class="title"> <img src="../../../assets/images/imgur.png"><a href="#imgur" data-localise="__MSG_imgur__">Imgur</a></div>
           <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg"><a href="#wikipedia" data-localise="__MSG_wikipedia__">Wikipedia</a></div>
           <div class="title"> 
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor">
@@ -34,7 +34,7 @@
           <div class="title"><img src="../../../assets/images/imdb.svg"><a href="#imdb" data-localise="__MSG_imdb__">IMDb</a></div>
           <div class="title"><img src="../../../assets/images/reuters.svg"><a href="#reuters" data-localise="__MSG_reuters__">Reuters</a></div>
           <div class="title"> <img src="../../../assets/images/peertube-icon.svg"><a href="#peertube" data-localise="__MSG_peertube__">PeerTube</a></div>
-          <div class="title"> <img src="../../../assets/images/lbry-icon.png"><a href="#lbry" data-localise="__MSG_lbry__">LBRY/Odysee</a></div>
+          <div class="title"> <img src="../../../assets/images/lbry-icon.png"><a href="#lbry" data-localise="__MSG_lbry__">LBRY</a></div>
           <div class="title"> 
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
                   <path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path>
@@ -94,6 +94,13 @@
           <h4 data-localise="__MSG_autoRedirect__"></h4>
           <input id="auto-redirect" type="checkbox">
         </div>
+        <form>
+          <div class="some-block option-block">
+            <h4 data-localise="__MSG_latencyThreshold">Latency Threshold</h4>
+            <output id="latency-output" for="latencyInput" name="latencyOutput"></output>
+            <input id="latency-input" type="range" min="50" max="5000" value="1000" name="latencyInput" step="50">
+          </div>
+        </form>
         <div class="some-block option-block">
           <h4 data-localise="__MSG_exceptions__"></h4>
         </div>
@@ -173,7 +180,7 @@
             <input id="tiktok" type="checkbox">
           </div>
           <div> 
-            <div> <img src="../../../assets/images/imgur-icon.png">
+            <div> <img src="../../../assets/images/imgur.png">
               <x data-localise="__MSG_imgur__">Imgur</x>
             </div>
             <input id="imgur" type="checkbox">
@@ -254,7 +261,7 @@
           </div>
           <div> 
             <div> <img src="../../../assets/images/lbry-icon.png">
-              <x data-localise="__MSG_lbry__">LBRY/Odysee</x>
+              <x data-localise="__MSG_lbry__">LBRY</x>
             </div>
             <input id="lbry" type="checkbox">
           </div>
@@ -3179,4 +3186,4 @@
     </div>
   </body>
   <script type="module" src="./index.js"></script>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/pages/options/index.pug b/src/pages/options/index.pug
index 553f918f..3711fdac 100644
--- a/src/pages/options/index.pug
+++ b/src/pages/options/index.pug
@@ -33,4 +33,4 @@ html#elementToShowWithJavaScript(lang="en")
             include ./widgets/sendTargets.pug
             include ./widgets/about.pug
 
-    script(type="module" src="./index.js")
\ No newline at end of file
+    script(type="module" src="./index.js")
diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js
index 5407159d..d6824251 100644
--- a/src/pages/options/widgets/general.js
+++ b/src/pages/options/widgets/general.js
@@ -56,31 +56,7 @@ importSettingsElement.addEventListener("change", () => {
 	reader.onload = async () => {
 		const data = JSON.parse(reader.result)
 		if ("theme" in data && "disableImgur" in data && "imgurRedirects" in data) {
-			browser.storage.local.clear(() => {
-				browser.storage.local.set({ ...data }, async () => {
-					await youtubeHelper.pasteInvidiousCookies()
-					await youtubeHelper.pastePipedLocalStorage()
-					await youtubeHelper.pastePipedMaterialLocalStorage()
-
-					await translateHelper.pasteSimplyTranslateCookies()
-					await translateHelper.pasteLingvaLocalStorage()
-
-					await twitterHelper.pasteNitterCookies()
-
-					await wikipediaHelper.pasteWikilessCookies()
-
-					await searchHelper.pasteSearxCookies()
-					await searchHelper.pasteSearxngCookies()
-					await searchHelper.pasteLibrexCookies()
-
-					await redditHelper.pasteLibredditCookies()
-					await redditHelper.pasteTedditCookies()
-
-					await tiktokHelper.pasteProxiTokCookies()
-
-					location.reload()
-				})
-			})
+			browser.storage.local.clear(() => browser.storage.local.set({ ...data }, () => location.reload()))
 		} else {
 			console.log("incompatible settings")
 			importError()
@@ -105,6 +81,7 @@ resetSettings.addEventListener("click", async () => {
 			.then(response => response.text())
 			.then(async data => {
 				browser.storage.local.set({ cloudflareBlackList: JSON.parse(data).cloudflare }, () => {
+					browser.storage.local.set({ offlineBlackList: JSON.parse(data).offline }, () => {
 					browser.storage.local.set({ authenticateBlackList: JSON.parse(data).authenticate }, async () => {
 						await generalHelper.initDefaults()
 						await youtubeHelper.initDefaults()
@@ -127,6 +104,7 @@ resetSettings.addEventListener("click", async () => {
 						await lbryHelper.initDefaults()
 						location.reload()
 					})
+					})
 				})
 			})
 	})
@@ -156,6 +134,15 @@ protocolFallbackCheckbox.addEventListener("change", event => {
 	browser.storage.local.set({ protocolFallback: event.target.checked })
 })
 
+let latencyOutput = document.getElementById("latency-output")
+let latencyInput = document.getElementById("latency-input")
+latencyInput.addEventListener("change", event => {
+	browser.storage.local.set({ latencyThreshold: event.target.value })
+})
+latencyInput.addEventListener("input", event => {
+	latencyOutput.value = event.target.value
+})
+
 let nameCustomInstanceInput = document.getElementById("exceptions-custom-instance")
 let instanceTypeElement = document.getElementById("exceptions-custom-instance-type")
 let instanceType = "url"
@@ -181,6 +168,7 @@ browser.storage.local.get(
 		"exceptions",
 		"protocol",
 		"protocolFallback",
+		"latencyThreshold",
 		// 'firstPartyIsolate'
 	],
 	r => {
@@ -188,6 +176,7 @@ browser.storage.local.get(
 		themeElement.value = r.theme
 		protocolElement.value = r.protocol
 		protocolFallbackCheckbox.checked = r.protocolFallback
+		latencyOutput.value = r.latencyThreshold
 		// firstPartyIsolate.checked = r.firstPartyIsolate;
 
 		let protocolFallbackElement = document.getElementById("protocol-fallback")
diff --git a/src/pages/options/widgets/general.pug b/src/pages/options/widgets/general.pug
index e04e9e2a..e523d5bb 100644
--- a/src/pages/options/widgets/general.pug
+++ b/src/pages/options/widgets/general.pug
@@ -31,6 +31,12 @@ section#general_page.option-block
         h4(data-localise="__MSG_autoRedirect__")
         input#auto-redirect(type="checkbox")
 
+    form
+        .some-block.option-block
+            h4(data-localise="__MSG_latencyThreshold") Latency Threshold
+            output#latency-output(for="latencyInput" name="latencyOutput")
+            input#latency-input(type="range" min="50" max="5000" value="1000" name="latencyInput" step="50")
+
     .some-block.option-block
         h4(data-localise="__MSG_exceptions__")
 
@@ -117,7 +123,7 @@ section#general_page.option-block
 
         div 
             div 
-                img(src="../../../assets/images/imgur-icon.png")
+                img(src="../../../assets/images/imgur.png")
                 x(data-localise="__MSG_imgur__") Imgur
             input#imgur(type="checkbox")
 
@@ -190,7 +196,7 @@ section#general_page.option-block
         div 
             div 
                 img(src="../../../assets/images/lbry-icon.png")
-                x(data-localise="__MSG_lbry__") LBRY/Odysee
+                x(data-localise="__MSG_lbry__") LBRY
             input#lbry(type="checkbox")
 
         div 
diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html
index 7493ecbe..25f70f48 100644
--- a/src/pages/popup/popup.html
+++ b/src/pages/popup/popup.html
@@ -28,7 +28,7 @@
           <h4 data-localise="__MSG_tiktok__">TikTok</h4></a>
         <input class="disable-tiktok" type="checkbox"/>
       </div>
-      <div class="imgur some-block"><a class="title" href="https://imgur.com"><img src="../../assets/images/imgur-icon.png"/>
+      <div class="imgur some-block"><a class="title" href="https://imgur.com"><img src="../../assets/images/imgur.png"/>
           <h4 data-localise="__MSG_imgur__">Imgur</h4></a>
         <input class="disable-imgur" type="checkbox"/>
       </div>
@@ -122,7 +122,7 @@
           <h4 data-localise="__MSG_tiktok__">TikTok</h4></a>
         <input class="disable-tiktok" type="checkbox"/>
       </div>
-      <div class="imgur some-block"><a class="title" href="https://imgur.com"><img src="../../assets/images/imgur-icon.png"/>
+      <div class="imgur some-block"><a class="title" href="https://imgur.com"><img src="../../assets/images/imgur.png"/>
           <h4 data-localise="__MSG_imgur__">Imgur</h4></a>
         <input class="disable-imgur" type="checkbox"/>
       </div>
diff --git a/src/pages/popup/popup.pug b/src/pages/popup/popup.pug
index cd4d3713..7da687cc 100644
--- a/src/pages/popup/popup.pug
+++ b/src/pages/popup/popup.pug
@@ -33,7 +33,7 @@ mixin services
 
     .imgur.some-block
         a.title(href="https://imgur.com")
-            img(src="../../assets/images/imgur-icon.png")
+            img(src="../../assets/images/imgur.png")
             h4(data-localise="__MSG_imgur__") Imgur
         input.disable-imgur(type="checkbox")
 
diff --git a/src/pages/widgets/links.pug b/src/pages/widgets/links.pug
index cac2ecb3..c7f8e0a6 100644
--- a/src/pages/widgets/links.pug
+++ b/src/pages/widgets/links.pug
@@ -31,7 +31,7 @@ mixin links(service)
             a(href="#reddit" data-localise="__MSG_reddit__") Reddit
 
         .title 
-            img(src="../../../assets/images/imgur-icon.png")
+            img(src="../../../assets/images/imgur.png")
             a(href="#imgur" data-localise="__MSG_imgur__") Imgur
 
         .title 
@@ -60,7 +60,7 @@ mixin links(service)
 
         .title 
             img(src="../../../assets/images/lbry-icon.png")
-            a(href="#lbry" data-localise="__MSG_lbry__") LBRY/Odysee
+            a(href="#lbry" data-localise="__MSG_lbry__") LBRY
 
         .title 
             +search
@@ -80,4 +80,4 @@ mixin links(service)
         
         .title
             +about
-            a(href="#about" data-localise="__MSG_about") About
\ No newline at end of file
+            a(href="#about" data-localise="__MSG_about") About