Merge branch 'update-blacklist'

10 files changed, 56 insertions, 52 deletions

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index c6e9ab7a..39c10052 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -22,8 +22,11 @@ import sendTargetsHelper from "../../assets/javascripts/sendTargets.js"
 import peertubeHelper from "../../assets/javascripts/peertube.js"
 import lbryHelper from "../../assets/javascripts/lbry.js"
 
+import frontend from "../../assets/javascripts/frontend.js"
+
 window.browser = window.browser || window.chrome
 
+
 browser.runtime.onInstalled.addListener(details => {
 	function initDefaults() {
 		fetch("/instances/blacklist.json")
diff --git a/src/pages/options/index.html b/src/pages/options/index.html
index 077b3da2..b8541ff9 100644
--- a/src/pages/options/index.html
+++ b/src/pages/options/index.html
@@ -30,9 +30,9 @@
                   <ellipse cx="1682" cy="502" rx="88" ry="424"></ellipse>
                 </svg><a href="#medium" data-localise="__MSG_medium__">Medium</a>
           </div>
-          <div class="title"><img src="../../../assets/images/quora.png"><a href="#quora" data-localise="__MSG_quora__">Quora</a></div>
-          <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/quora.png"><a href="#quora">Quora</a></div>
+          <div class="title"><img src="../../../assets/images/imdb.svg"><a href="#imdb">IMDb</a></div>
+          <div class="title"><img src="../../../assets/images/reuters.svg"><a href="#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</a></div>
           <div class="title"> 
@@ -237,19 +237,19 @@
           </div>
           <div> 
             <div> <img src="../../../assets/images/quora.png">
-              <x data-localise="__MSG_quora__">Quora</x>
+              <x>Quora</x>
             </div>
             <input id="quora" type="checkbox">
           </div>
           <div> 
             <div> <img src="../../../assets/images/imdb.svg">
-              <x data-localise="__MSG_imdb__">IMDb</x>
+              <x>IMDb</x>
             </div>
             <input id="imdb" type="checkbox">
           </div>
           <div> 
             <div> <img src="../../../assets/images/reuters.svg">
-              <x data-localise="__MSG_reuters__">Reuters</x>
+              <x>Reuters</x>
             </div>
             <input id="reuters" type="checkbox">
           </div>
@@ -1774,7 +1774,7 @@
       </section>
       <section class="option-block" id="quora_page">
         <div class="some-block option-block">
-          <h1 data-localise="__MSG_quora__">Quora</h1>
+          <h1>Quora</h1>
         </div>
         <hr>
         <div class="some-block option-block">
@@ -1881,7 +1881,7 @@
       </section>
       <section class="option-block" id="imdb_page">
         <div class="some-block option-block">
-          <h1 data-localise="__MSG_imdb__">IMDb</h1>
+          <h1>IMDb</h1>
         </div>
         <hr>
         <div class="some-block option-block">
@@ -1988,7 +1988,7 @@
       </section>
       <section class="option-block" id="reuters_page">
         <div class="some-block option-block">
-          <h1 data-localise="__MSG_reuters__">Reuters</h1>
+          <h1>Reuters</h1>
         </div>
         <hr>
         <div class="some-block option-block">
@@ -3186,4 +3186,4 @@
     </div>
   </body>
   <script type="module" src="./index.js"></script>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js
index d6824251..61b422f4 100644
--- a/src/pages/options/widgets/general.js
+++ b/src/pages/options/widgets/general.js
@@ -36,15 +36,16 @@ updateInstancesElement.addEventListener("click", async () => {
 let exportSettingsElement = document.getElementById("export-settings")
 
 function exportSettings() {
-	browser.storage.local.get(null, result => {
+	return browser.storage.local.get(null, result => {
 		let resultString = JSON.stringify(result, null, "  ")
 		exportSettingsElement.href = "data:application/json;base64," + btoa(encodeURI(resultString))
 		exportSettingsElement.download = "libredirect-settings.json"
+		return
 	})
 }
 exportSettings()
 
-document.getElementById("general_page").addEventListener("click", exportSettings)
+document.getElementById("general_page").onclick = exportSettings
 
 let importSettingsElement = document.getElementById("import-settings")
 let importSettingsElementText = document.getElementById("import_settings_text")
@@ -82,28 +83,28 @@ resetSettings.addEventListener("click", async () => {
 			.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()
-						await youtubeMusicHelper.initDefaults()
-						await twitterHelper.initDefaults()
-						await instagramHelper.initDefaults()
-						await mapsHelper.initDefaults()
-						await searchHelper.initDefaults()
-						await translateHelper.initDefaults()
-						await mediumHelper.initDefaults()
-						await quoraHelper.initDefaults()
-						await libremdbHelper.initDefaults()
-						await reutersHelper.initDefaults()
-						await redditHelper.initDefaults()
-						await wikipediaHelper.initDefaults()
-						await imgurHelper.initDefaults()
-						await tiktokHelper.initDefaults()
-						await sendTargetsHelper.initDefaults()
-						await peertubeHelper.initDefaults()
-						await lbryHelper.initDefaults()
-						location.reload()
-					})
+						browser.storage.local.set({ authenticateBlackList: JSON.parse(data).authenticate }, async () => {
+							await generalHelper.initDefaults()
+							await youtubeHelper.initDefaults()
+							await youtubeMusicHelper.initDefaults()
+							await twitterHelper.initDefaults()
+							await instagramHelper.initDefaults()
+							await mapsHelper.initDefaults()
+							await searchHelper.initDefaults()
+							await translateHelper.initDefaults()
+							await mediumHelper.initDefaults()
+							await quoraHelper.initDefaults()
+							await libremdbHelper.initDefaults()
+							await reutersHelper.initDefaults()
+							await redditHelper.initDefaults()
+							await wikipediaHelper.initDefaults()
+							await imgurHelper.initDefaults()
+							await tiktokHelper.initDefaults()
+							await sendTargetsHelper.initDefaults()
+							await peertubeHelper.initDefaults()
+							await lbryHelper.initDefaults()
+							location.reload()
+						})
 					})
 				})
 			})
diff --git a/src/pages/options/widgets/general.pug b/src/pages/options/widgets/general.pug
index e523d5bb..891217ca 100644
--- a/src/pages/options/widgets/general.pug
+++ b/src/pages/options/widgets/general.pug
@@ -172,19 +172,19 @@ section#general_page.option-block
         div 
             div 
                 img(src="../../../assets/images/quora.png")
-                x(data-localise="__MSG_quora__") Quora
+                x() Quora
             input#quora(type="checkbox")
 
         div 
             div 
                 img(src="../../../assets/images/imdb.svg")
-                x(data-localise="__MSG_imdb__") IMDb
+                x IMDb
             input#imdb(type="checkbox")
 
         div 
             div 
                 img(src="../../../assets/images/reuters.svg")
-                x(data-localise="__MSG_reuters__") Reuters
+                x Reuters
             input#reuters(type="checkbox")
 
         div 
diff --git a/src/pages/options/widgets/imdb.pug b/src/pages/options/widgets/imdb.pug
index 008e1c00..257d2c1a 100644
--- a/src/pages/options/widgets/imdb.pug
+++ b/src/pages/options/widgets/imdb.pug
@@ -1,6 +1,6 @@
 section#imdb_page.option-block
     .some-block.option-block
-        h1(data-localise="__MSG_imdb__") IMDb
+        h1() IMDb
     hr
     .some-block.option-block
         h4(data-localise="__MSG_enable__") Enable
diff --git a/src/pages/options/widgets/quora.pug b/src/pages/options/widgets/quora.pug
index 9e45abc9..addfe280 100644
--- a/src/pages/options/widgets/quora.pug
+++ b/src/pages/options/widgets/quora.pug
@@ -1,6 +1,6 @@
 section#quora_page.option-block
     .some-block.option-block
-        h1(data-localise="__MSG_quora__") Quora
+        h1() Quora
     hr
     .some-block.option-block
         h4(data-localise="__MSG_enable__") Enable
diff --git a/src/pages/options/widgets/reuters.pug b/src/pages/options/widgets/reuters.pug
index 08a37d50..9ed6b3b9 100644
--- a/src/pages/options/widgets/reuters.pug
+++ b/src/pages/options/widgets/reuters.pug
@@ -1,6 +1,6 @@
 section#reuters_page.option-block
     .some-block.option-block
-        h1(data-localise="__MSG_reuters__") Reuters
+        h1() Reuters
     hr
     .some-block.option-block
         h4(data-localise="__MSG_enable__") Enable
diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html
index 25f70f48..1c3f6ea2 100644
--- a/src/pages/popup/popup.html
+++ b/src/pages/popup/popup.html
@@ -50,15 +50,15 @@
         <input class="disable-medium" type="checkbox"/>
       </div>
       <div class="quora some-block"><a class="title" href="https://quora.com"><img src="../../assets/images/quora.png"/>
-          <h4 data-localise="__MSG_quora__">Quora</h4></a>
+          <h4>Quora</h4></a>
         <input class="disable-quora" type="checkbox"/>
       </div>
       <div class="imdb some-block"><a class="title" href="https://imdb.com"><img src="../../assets/images/imdb.svg"/>
-          <h4 data-localise="__MSG_imdb__">IMDb</h4></a>
+          <h4>IMDb</h4></a>
         <input class="disable-imdb" type="checkbox"/>
       </div>
       <div class="reuters some-block"><a class="title" href="https://reuters.com"><img src="../../assets/images/reuters.svg"/>
-          <h4 data-localise="__MSG_reuters__">Reuters</h4></a>
+          <h4>Reuters</h4></a>
         <input class="disable-reuters" type="checkbox"/>
       </div>
       <div class="peertube some-block"><a class="title" href="https://search.joinpeertube.org"><img src="../../assets/images/peertube-icon.svg"/>
@@ -144,15 +144,15 @@
         <input class="disable-medium" type="checkbox"/>
       </div>
       <div class="quora some-block"><a class="title" href="https://quora.com"><img src="../../assets/images/quora.png"/>
-          <h4 data-localise="__MSG_quora__">Quora</h4></a>
+          <h4>Quora</h4></a>
         <input class="disable-quora" type="checkbox"/>
       </div>
       <div class="imdb some-block"><a class="title" href="https://imdb.com"><img src="../../assets/images/imdb.svg"/>
-          <h4 data-localise="__MSG_imdb__">IMDb</h4></a>
+          <h4>IMDb</h4></a>
         <input class="disable-imdb" type="checkbox"/>
       </div>
       <div class="reuters some-block"><a class="title" href="https://reuters.com"><img src="../../assets/images/reuters.svg"/>
-          <h4 data-localise="__MSG_reuters__">Reuters</h4></a>
+          <h4>Reuters</h4></a>
         <input class="disable-reuters" type="checkbox"/>
       </div>
       <div class="peertube some-block"><a class="title" href="https://search.joinpeertube.org"><img src="../../assets/images/peertube-icon.svg"/>
diff --git a/src/pages/popup/popup.pug b/src/pages/popup/popup.pug
index 7da687cc..cc7fc7a2 100644
--- a/src/pages/popup/popup.pug
+++ b/src/pages/popup/popup.pug
@@ -58,19 +58,19 @@ mixin services
     .quora.some-block
         a.title(href="https://quora.com")
             img(src="../../assets/images/quora.png")
-            h4(data-localise="__MSG_quora__") Quora
+            h4() Quora
         input.disable-quora(type="checkbox")
     
     .imdb.some-block
         a.title(href="https://imdb.com")
             img(src="../../assets/images/imdb.svg")
-            h4(data-localise="__MSG_imdb__") IMDb
+            h4() IMDb
         input.disable-imdb(type="checkbox")
 
     .reuters.some-block
         a.title(href="https://reuters.com")
             img(src="../../assets/images/reuters.svg")
-            h4(data-localise="__MSG_reuters__") Reuters
+            h4() Reuters
         input.disable-reuters(type="checkbox")
 
     .peertube.some-block
diff --git a/src/pages/widgets/links.pug b/src/pages/widgets/links.pug
index c7f8e0a6..37fe9375 100644
--- a/src/pages/widgets/links.pug
+++ b/src/pages/widgets/links.pug
@@ -44,15 +44,15 @@ mixin links(service)
 
         .title
             img(src="../../../assets/images/quora.png")
-            a(href="#quora" data-localise="__MSG_quora__") Quora
+            a(href="#quora" ) Quora
 
         .title
             img(src="../../../assets/images/imdb.svg")
-            a(href="#imdb" data-localise="__MSG_imdb__") IMDb
+            a(href="#imdb") IMDb
 
         .title
             img(src="../../../assets/images/reuters.svg")
-            a(href="#reuters" data-localise="__MSG_reuters__") Reuters
+            a(href="#reuters") Reuters
 
         .title 
             img(src="../../../assets/images/peertube-icon.svg")