Archives
/
bypass-paywalls-firefox-clean
mirror of https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error during tabs.get (no tab with id)

Browse Source 
Plus maintenance background.js
merge-requests/1/head
magnolia1234 4 years ago
parent 9e7e0af318
commit 42667b357c
4 changed files with 59 additions and 75 deletions
Show Stats Download Patch File Download Diff File

129
background.js
Unescape Escape View File

@ -327,6 +327,54 @@ ext_api.storage.sync.get({
}
});
// add grouped sites to en/disabledSites & init rules (optional)
function add_grouped_sites(init_rules) {
if (enabledSites.includes('ad.nl'))
enabledSites = enabledSites.concat(ad_region_domains);
else
disabledSites = disabledSites.concat(ad_region_domains);
if (enabledSites.includes('nymag.com'))
enabledSites = enabledSites.concat(nymag_domains);
else
disabledSites = disabledSites.concat(nymag_domains);
if (enabledSites.includes('ilmessaggero.it')) {
enabledSites = enabledSites.concat(ilmessaggero_domains);
if (init_rules)
for (let domain of ilmessaggero_domains) {
blockedRegexes[domain] = /utils\.cedsdigital\.it\/js\/PaywallMeter\.js/;
}
} else
disabledSites = disabledSites.concat(ilmessaggero_domains);
if (enabledSites.includes('###_au_comm_media')) {
enabledSites = enabledSites.concat(au_comm_media_domains);
if (init_rules)
for (let domain of au_comm_media_domains) {
allow_cookies.push(domain);
blockedRegexes[domain] = /.+cdn-au\.piano\.io\/api\/tinypass.+\.js/;
}
} else
disabledSites = disabledSites.concat(au_comm_media_domains);
if (enabledSites.includes('###_au_news_corp')) {
enabledSites = enabledSites.concat(au_news_corp_domains);
if (init_rules)
for (let domain of au_news_corp_domains) {
allow_cookies.push(domain);
use_google_bot.push(domain);
blockedRegexes[domain] = /cdn\.ampproject\.org\/v\d\/amp-access-.+\.js/;
}
} else
disabledSites = disabledSites.concat(au_news_corp_domains);
if (enabledSites.includes('###_au_prov_news')) {
enabledSites = enabledSites.concat(au_prov_news_domains);
if (init_rules)
for (let domain of au_prov_news_domains) {
allow_cookies.push(domain);
use_google_bot.push(domain);
}
} else
disabledSites = disabledSites.concat(au_prov_news_domains);
}
// Get the enabled sites (from local storage) & add to allow/remove_cookies (if not already in one of these arrays)
// Add googlebot- and block_javascript-settings for custom sites
ext_api.storage.local.get({
@ -338,18 +386,14 @@ ext_api.storage.local.get({
for (let key in sites_custom) {
var domainVar = sites_custom[key]['domain'].toLowerCase();
if (sites_custom[key]['googlebot'] > 0 && !use_google_bot.includes(domainVar)) {
if (sites_custom[key]['googlebot'] > 0 && !use_google_bot.includes(domainVar))
use_google_bot.push(domainVar);
}
if (sites_custom[key]['allow_cookies'] > 0 && !allow_cookies.includes(domainVar)) {
if (sites_custom[key]['allow_cookies'] > 0 && !allow_cookies.includes(domainVar))
allow_cookies.push(domainVar);
}
if (sites_custom[key]['block_javascript'] > 0) {
if (sites_custom[key]['block_javascript'] > 0)
block_js_custom.push(domainVar);
}
if (sites_custom[key]['block_javascript_ext'] > 0) {
if (sites_custom[key]['block_javascript_ext'] > 0)
block_js_custom_ext.push(domainVar);
}
}
enabledSites = Object.keys(sites).filter(function (key) {
@ -360,46 +404,7 @@ ext_api.storage.local.get({
customSites = sites_custom;
customSites_domains = Object.values(sites_custom).map(x => x.domain);
disabledSites = defaultSites_domains.concat(customSites_domains).filter(x => !enabledSites.includes(x) && x !== '###');
if (enabledSites.includes('ad.nl'))
enabledSites = enabledSites.concat(ad_region_domains);
else
disabledSites = disabledSites.concat(ad_region_domains);
if (enabledSites.includes('nymag.com')) {
enabledSites = enabledSites.concat(nymag_domains);
} else
disabledSites = disabledSites.concat(nymag_domains);
if (enabledSites.includes('ilmessaggero.it')) {
enabledSites = enabledSites.concat(ilmessaggero_domains);
for (let domain of ilmessaggero_domains) {
blockedRegexes[domain] = /utils\.cedsdigital\.it\/js\/PaywallMeter\.js/;
}
} else
disabledSites = disabledSites.concat(ilmessaggero_domains);
if (enabledSites.includes('###_au_comm_media')) {
enabledSites = enabledSites.concat(au_comm_media_domains);
for (let domain of au_comm_media_domains) {
allow_cookies.push(domain);
blockedRegexes[domain] = /.+cdn-au\.piano\.io\/api\/tinypass.+\.js/;
}
} else
disabledSites = disabledSites.concat(au_comm_media_domains);
if (enabledSites.includes('###_au_news_corp')) {
enabledSites = enabledSites.concat(au_news_corp_domains);
for (let domain of au_news_corp_domains) {
allow_cookies.push(domain);
use_google_bot.push(domain);
blockedRegexes[domain] = /cdn\.ampproject\.org\/v\d\/amp-access-.+\.js/;
}
} else
disabledSites = disabledSites.concat(au_news_corp_domains);
if (enabledSites.includes('###_au_prov_news')) {
enabledSites = enabledSites.concat(au_prov_news_domains);
for (let domain of au_prov_news_domains) {
allow_cookies.push(domain);
use_google_bot.push(domain);
}
} else
disabledSites = disabledSites.concat(au_prov_news_domains);
add_grouped_sites(true);
for (let domainVar of enabledSites) {
if (!allow_cookies.includes(domainVar) && !remove_cookies.includes(domainVar)) {
@ -424,30 +429,8 @@ ext_api.storage.onChanged.addListener(function (changes, namespace) {
return sites[key];
});
disabledSites = defaultSites_domains.concat(customSites_domains).filter(x => !enabledSites.includes(x) && x !== '###');
if (enabledSites.includes('ad.nl'))
enabledSites = enabledSites.concat(ad_region_domains);
else
disabledSites = disabledSites.concat(ad_region_domains);
if (enabledSites.includes('nymag.com'))
enabledSites = enabledSites.concat(nymag_domains);
else
disabledSites = disabledSites.concat(nymag_domains);
if (enabledSites.includes('ilmessaggero.it'))
enabledSites = enabledSites.concat(ilmessaggero_domains);
else
disabledSites = disabledSites.concat(nymag_domains);
if (enabledSites.includes('###_au_comm_media'))
enabledSites = enabledSites.concat(au_comm_media_domains);
else
disabledSites = disabledSites.concat(au_comm_media_domains);
if (enabledSites.includes('###_au_news_corp'))
enabledSites = enabledSites.concat(au_news_corp_domains);
else
disabledSites = disabledSites.concat(au_news_corp_domains);
if (enabledSites.includes('###_au_prov_news'))
enabledSites = enabledSites.concat(au_prov_news_domains);
else
disabledSites = disabledSites.concat(au_prov_news_domains);
add_grouped_sites(false);
for (let domainVar of enabledSites) {
if (!allow_cookies.includes(domainVar) && !remove_cookies.includes(domainVar)) {
allow_cookies.push(domainVar);
@ -837,7 +820,7 @@ ext_api.tabs.onUpdated.addListener(function (tabId, info, tab) { updateBadge(tab
ext_api.tabs.onActivated.addListener(function (activeInfo) { ext_api.tabs.get(activeInfo.tabId, updateBadge); });
function updateBadge(activeTab) {
if (!activeTab)
if (ext_api.runtime.lastError || !activeTab)
return;
let badgeText = '';
let color = 'red';

1
changelog.txt
Unescape Escape View File

@ -10,6 +10,7 @@ Fix-update Folha de S. Paulo (MatherAnalytics)
Fix-update Gazet van Antwerpen (video/maps)
Fix-update ilMessaggero.it (+ regional sites)
Fix-update WSJ (mobile layout)
Fix error during tabs.get (no tab with id)
Update custom sites: allow_cookies
* v1.9.4.0 (2020-11-08)

2
manifest.json
Unescape Escape View File

@ -348,5 +348,5 @@
"webRequest",
"webRequestBlocking"
],
"version": "1.9.4.6"
"version": "1.9.4.7"
}

2
version.js
Unescape Escape View File

@ -16,7 +16,7 @@ fetch(manifest_new)
if (version_new.substring(0, version_len) > manifestData.version.substring(0, version_len)) {
var versionString_new = document.getElementById('version_new');
versionString_new.setAttribute('style', 'font-weight: bold;');
versionString_new.appendChild(document.createTextNode('* '));
versionString_new.appendChild(document.createTextNode(' * '));
var anchorEl = document.createElement('a');
anchorEl.text = 'New release v' + version_new;
if (manifestData.applications.gecko.id.includes('magnolia'))

Write Preview
Loading…
Cancel
Save