Fix-update El Periodico de Catalunya

Plus maintenance background.js
3 years ago · 2f385d10ff
parent fa0dfd3de9
commit 2f385d10ff
4 changed files with 28 additions and 18 deletions
--- a/background.js
+++ b/background.js
@ -884,21 +884,24 @@ ext_api.webRequest.onBeforeSendHeaders.addListener(function(details) {
    });
  }

-  let inkl_site = (matchUrlDomain('cdn.jsdelivr.net', details.url) && matchUrlDomain('inkl.com', header_referer) && isSiteEnabled({url: header_referer}));
-  let au_nc_amp_site = (matchUrlDomain('cdn.ampproject.org', details.url) && matchUrlDomain(au_news_corp_domains, header_referer) && isSiteEnabled({url: header_referer}));
+  let allow_ext_source = medium_custom_domain;
+  let bpc_amp_site = false;
  let au_apn_site = (header_referer && (urlHost(header_referer).endsWith('com.au') || urlHost(header_referer).endsWith('net.au')) && details.url.includes('https://media.apnarm.net.au/'));
  let au_swm_site = (header_referer && urlHost(header_referer).endsWith('com.au') && details.url.includes('https://s.thewest.com.au/'));
-  let cl_elmerc_site = (matchUrlDomain('emol.cl', details.url) && matchUrlDomain('elmercurio.com', header_referer) && isSiteEnabled({url: header_referer}));
-  let it_repubblica_site = (matchUrlDomain(['repstatic.it'], details.url) && matchUrlDomain(it_repubblica_domains, header_referer) && isSiteEnabled({url: header_referer}));
-  let uk_nlr_site = (matchUrlDomain('stripe.com', details.url) && matchUrlDomain('newleftreview.org', header_referer) && isSiteEnabled({url: header_referer}));
-  let usa_discmag_site = (matchUrlDomain('ctfassets.net', details.url) && matchUrlDomain('discovermagazine.com', header_referer) && isSiteEnabled({url: header_referer}));
-  let usa_mw_site = (matchUrlDomain('wsj.net', details.url) && matchUrlDomain('marketwatch.com', header_referer) && isSiteEnabled({url: header_referer}));
-  let allow_ext_source = inkl_site || au_nc_amp_site || au_apn_site || au_swm_site || cl_elmerc_site || it_repubblica_site || medium_custom_domain || uk_nlr_site || usa_discmag_site || usa_mw_site;

-  let bpc_amp_site = (matchUrlDomain('cdn.ampproject.org', details.url) && isSiteEnabled({url: header_referer}) &&
-    matchUrlDomain(['augsburger-allgemeine.de', 'barrons.com', 'belfasttelegraph.co.uk', 'cicero.de', 'cmjornal.pt', 'elmundo.es', 'elpais.com', 'elperiodico.com', 'expansion.com', 'freiepresse.de', 'independent.ie', 'irishtimes.com', 'la-croix.com', 'lne.es', 'marketwatch.com', 'nationalreview.com', 'noz.de', 'seekingalpha.com', 'shz.de', 'sueddeutsche.de', 'svz.de', 'telegraph.co.uk'].concat(au_nine_domains, de_madsack_domains, de_rp_medien_domains, es_grupo_vocento_domains, fr_groupe_ebra_domains, fr_groupe_la_depeche_domains, it_repubblica_domains, usa_mcc_domains), header_referer));
+  if (isSiteEnabled({url: header_referer})) {
+    let inkl_site = (matchUrlDomain('cdn.jsdelivr.net', details.url) && matchUrlDomain('inkl.com', header_referer));
+    let cl_elmerc_site = (matchUrlDomain('emol.cl', details.url) && matchUrlDomain('elmercurio.com', header_referer));
+    let it_repubblica_site = (matchUrlDomain(['repstatic.it'], details.url) && matchUrlDomain(it_repubblica_domains, header_referer));
+    let uk_nlr_site = (matchUrlDomain('stripe.com', details.url) && matchUrlDomain('newleftreview.org', header_referer));
+    let usa_discmag_site = (matchUrlDomain('ctfassets.net', details.url) && matchUrlDomain('discovermagazine.com', header_referer));
+    let usa_mw_site = (matchUrlDomain('wsj.net', details.url) && matchUrlDomain('marketwatch.com', header_referer));
+    allow_ext_source = allow_ext_source || inkl_site || cl_elmerc_site || it_repubblica_site || uk_nlr_site || usa_discmag_site || usa_mw_site;

-  if (!isSiteEnabled(details) &&  !allow_ext_source && !bpc_amp_site) {
+    bpc_amp_site = (matchUrlDomain('cdn.ampproject.org', details.url) && matchUrlDomain(['augsburger-allgemeine.de', 'barrons.com', 'belfasttelegraph.co.uk', 'cicero.de', 'cmjornal.pt', 'elmundo.es', 'elpais.com', 'elperiodico.com', 'expansion.com', 'freiepresse.de', 'independent.ie', 'irishtimes.com', 'la-croix.com', 'lne.es', 'marketwatch.com', 'nationalreview.com', 'noz.de', 'seekingalpha.com', 'shz.de', 'sueddeutsche.de', 'svz.de', 'telegraph.co.uk'].concat(au_news_corp_domains, au_nine_domains, de_madsack_domains, de_rp_medien_domains, es_grupo_vocento_domains, fr_groupe_ebra_domains, fr_groupe_la_depeche_domains, it_repubblica_domains, usa_mcc_domains), header_referer));
+  }
+
+  if (!isSiteEnabled(details) &&  !allow_ext_source && !bpc_amp_site && !au_apn_site && !au_swm_site) {
    return;
  }

@ -922,7 +925,7 @@ ext_api.webRequest.onBeforeSendHeaders.addListener(function(details) {
  var useUserAgentMobile = false;
  var setReferer = false;

-if (['main_frame', 'sub_frame', 'xmlhttprequest'].includes(details.type) && matchUrlDomain(change_headers, details.url)){
+if ((['main_frame', 'sub_frame', 'xmlhttprequest'].includes(details.type) || matchUrlDomain(['thetimes.co.uk'], details.url)) && matchUrlDomain(change_headers, details.url)){
  // if referer exists, set it to google
  requestHeaders = requestHeaders.map(function (requestHeader) {
    if (requestHeader.name === 'Referer') {
@ -1169,6 +1172,7 @@ ext_api.webRequest.onCompleted.addListener(function (details) {
            if (cookie.name.match(/(consent|^optanon)/i)) {
              continue;
            }
+            cookie.domain = cookie.domain.replace(/^\./, '');
            cookie_remove_options = {
              url: (cookie.secure ? "https://" : "http://") + cookie.domain + cookie.path,
              name: cookie.name
--- a/changelog.txt
+++ b/changelog.txt
@ -2,6 +2,7 @@
 Changelog Bypass Paywalls Clean - Firefox

 Post-release
+Fix-update El Periodico de Catalunya

 * v2.0.9.1 (2021-02-21)
 Fix options/cookie storeId (Firefox Android)
@ -154,7 +155,7 @@ Update popup (Twitter)

 * v1.9.7.0 (2020-11-27)
 Add Alma Talent sites (Finland)
-Add El Periodico (Spain)
+Add El Periodico de Catalunya (Spain)
 Add Grupo Vocento (Spain, regional daily)
 Add La Croix (France)
 Add The Hindu BusinessLine (India)
--- a/contentScript.js
+++ b/contentScript.js
@ -1701,10 +1701,15 @@ else if (matchDomain("corriere.it")) {
 else if (matchDomain("elperiodico.com")) {
    let url = window.location.href;
    if (!url.includes('amp.elperiodico.com')) {
-        let paywall = document.querySelector('.ep-masPeriodico-info-login');
-        removeDOMElement(paywall);
-        if (paywall)
-            window.location.href = url.replace('www.', 'amp.');
+        let div_hidden = document.querySelector('div.closed');
+        if (div_hidden)
+            div_hidden.classList.remove('closed');
+        else {
+            let paywall = document.querySelector('.ep-masPeriodico-info-login');
+            removeDOMElement(paywall);
+            if (paywall)
+                window.location.href = url.replace('www.', 'amp.');
+        }
    } else {
        let not_logged = document.querySelector('.ep-masPeriodico-info-login');
        if (not_logged) {
--- a/manifest.json
+++ b/manifest.json
@ -476,5 +476,5 @@
        "*://*.userzoom.com/*",
        "*://*.wsj.net/*"
    ],
-    "version": "2.0.9.1"
+    "version": "2.0.9.2"
 }