Fix some error in runtime.onInstalled

3 files changed, 10 insertions, 45 deletions

diff --git a/src/assets/javascripts/general.js b/src/assets/javascripts/general.js
index 072ff3c1..720b5769 100644
--- a/src/assets/javascripts/general.js
+++ b/src/assets/javascripts/general.js
@@ -1,17 +1,20 @@
 "use strict"
 window.browser = window.browser || window.chrome
 
+let exceptions
+
 function isException(url) {
 	for (const item of exceptions.url) if (item == `${url.protocol}//${url.host}`) return true
 	for (const item of exceptions.regex) if (new RegExp(item).test(url.href)) return true
 	return false
 }
 
-let exceptions
-
 function init() {
-	browser.storage.local.get("exceptions", r => {
-		exceptions = r.exceptions
+	return new Promise(resolve => {
+		browser.storage.local.get("exceptions", r => {
+			exceptions = r.exceptions
+			resolve()
+		})
 	})
 }
 
diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js
index 64bed3bb..3aa93c53 100644
--- a/src/assets/javascripts/services.js
+++ b/src/assets/javascripts/services.js
@@ -76,8 +76,8 @@ function regexArray(service, url) {
 	return false

 }

 

-await getConfig()

-await init()

+getConfig()

+init()

 browser.storage.onChanged.addListener(init)

 

 function redirect(url, type, initiator) {

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index e0228df6..1f5bf24f 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -3,29 +3,11 @@
 import generalHelper from "../../assets/javascripts/general.js"

 import utils from "../../assets/javascripts/utils.js"

 

-import youtubeHelper from "../../assets/javascripts/youtube/youtube.js"

-import youtubeMusicHelper from "../../assets/javascripts/youtubeMusic.js"

-import twitterHelper from "../../assets/javascripts/twitter.js"

-import instagramHelper from "../../assets/javascripts/instagram.js"

-import redditHelper from "../../assets/javascripts/reddit.js"

-import searchHelper from "../../assets/javascripts/search.js"

-import translateHelper from "../../assets/javascripts/translate/translate.js"

-import mapsHelper from "../../assets/javascripts/maps.js"

-import wikipediaHelper from "../../assets/javascripts/wikipedia.js"

-import mediumHelper from "../../assets/javascripts/medium.js"

-import quoraHelper from "../../assets/javascripts/quora.js"

-import libremdbHelper from "../../assets/javascripts/imdb.js"

-import reutersHelper from "../../assets/javascripts/reuters.js"

-import imgurHelper from "../../assets/javascripts/imgur.js"

-import tiktokHelper from "../../assets/javascripts/tiktok.js"

-import sendTargetsHelper from "../../assets/javascripts/sendTargets.js"

-import peertubeHelper from "../../assets/javascripts/peertube.js"

-import lbryHelper from "../../assets/javascripts/lbry.js"

-

 import servicesHelper from "../../assets/javascripts/services.js"

 

 window.browser = window.browser || window.chrome

 

+

 browser.runtime.onInstalled.addListener(details => {

 	function initDefaults() {

 		fetch("/instances/blacklist.json")

@@ -36,26 +18,6 @@ browser.runtime.onInstalled.addListener(details => {
 						browser.storage.local.set({ authenticateBlackList: JSON.parse(data).authenticate }, () => {

 							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()

-								*/

 								servicesHelper.initDefaults()

 							})

 						})