Fix Estadao.com.br (amp)

changelog.txt

@@ -5,6 +5,7 @@ Post-release
 Add Groupe Centre France (opt-in to custom sites)
 Fix Aftonbladet.se
 Fix Business Standard
+Fix Estadao.com.br (amp)
 Fix Hearst Communications (newspapers)
 Fix The (New Orleans) Advocate
 Fix The Athletic

contentScript.js

@@ -16,6 +16,7 @@ var es_epiberica_custom_domains = ['diaridegirona.cat', 'diariocordoba.com', 'di
 var es_grupo_vocento_domains = ['abc.es', 'diariosur.es', 'diariovasco.com', 'elcomercio.es', 'elcorreo.com', 'eldiariomontanes.es', 'elnortedecastilla.es', 'hoy.es', 'ideal.es', 'larioja.com', 'lasprovincias.es', 'laverdad.es', 'lavozdigital.es'];
 var es_unidad_domains = ['elmundo.es', 'expansion.com', 'marca.com'];
 var fi_alma_talent_domains = ['arvopaperi.fi', 'iltalehti.fi', 'kauppalehti.fi', 'marmai.fi', 'mediuutiset.fi', 'mikrobitti.fi', 'talouselama.fi', 'tekniikkatalous.fi', 'tivi.fi', 'uusisuomi.fi'];
+var fr_be_groupe_rossel = ['aisnenouvelle.fr', 'courrier-picard.fr', 'lardennais.fr', 'lavoixdunord.fr', 'lesoir.be', 'lest-eclair.fr', 'liberation-champagne.fr', 'lunion.fr', 'nordeclair.fr', 'nordlittoral.fr', 'paris-normandie.fr', 'sudinfo.be'];
 var fr_groupe_ebra_domains = ['bienpublic.com', 'dna.fr', 'estrepublicain.fr', 'lalsace.fr', 'ledauphine.com', 'lejsl.com', 'leprogres.fr', 'republicain-lorrain.fr', 'vosgesmatin.fr'];
 var fr_groupe_la_depeche_domains = ['centrepresseaveyron.fr', 'ladepeche.fr', 'lindependant.fr', 'midi-olympique.fr', 'midilibre.fr', 'nrpyrenees.fr', 'petitbleu.fr'];
 var fr_groupe_nice_matin_domains = ['monacomatin.mc', 'nicematin.com', 'varmatin.com'];
@@ -1102,7 +1103,7 @@ else if (matchDomain('politicaexterior.com')) {
 else
   csDone = true;
 
-} else if (window.location.hostname.endsWith('.fr') || matchDomain(['bienpublic.com', 'connaissancedesarts.com', 'journaldunet.com', 'la-croix.com', 'lavenir.net', 'ledauphine.com', 'lesinrocks.com', 'lejsl.com', 'loeildelaphotographie.com', 'marianne.net', 'nouvelobs.com', 'parismatch.com', 'science-et-vie.com'].concat(fr_groupe_nice_matin_domains))) {//france
+} else if (window.location.hostname.endsWith('.fr') || matchDomain(['bienpublic.com', 'connaissancedesarts.com', 'journaldunet.com', 'la-croix.com', 'lavenir.net', 'ledauphine.com', 'lesinrocks.com', 'lejsl.com', 'lesoir.be', 'loeildelaphotographie.com', 'marianne.net', 'nouvelobs.com', 'parismatch.com', 'science-et-vie.com', 'sudinfo.be'].concat(fr_groupe_nice_matin_domains))) {//france
 
 if (matchDomain('alternatives-economiques.fr')) {
   window.setTimeout(function () {
@@ -1169,6 +1170,11 @@ else if (matchDomain('elle.fr')) {
   }
 }
 
+else if (matchDomain(fr_be_groupe_rossel)) {
+  let ads = document.querySelectorAll('div[id^="article_"], r-pub');
+  removeDOMElement(...ads);
+}
+
 else if (matchDomain(fr_groupe_ebra_domains)) {
   if (!window.location.pathname.startsWith('/amp/')) {
     let paywall = document.querySelector('div.preview');
@@ -2343,11 +2349,12 @@ else if (matchDomain('em.com.br')) {
 }
 
 else if (matchDomain('estadao.com.br')) {
-  if (window.location.pathname.endsWith('.amp')) {
-    amp_unhide_access_hide('="granted"', '="NOT granted"', 'amp-ad, amp-embed, amp-fx-flying-carpet');
+  if (window.location.pathname.match(/(\.amp$|^\/amp\/)/) || window.location.search.startsWith('?amp')) {
+    amp_unhide_access_hide('="outputValue=\'hide_paywall\'"', '="outputValue=\'show_paywall\'"', 'amp-ad, amp-embed, amp-fx-flying-carpet, div[class^="pAd"]');
   } else {
     let paywall = document.getElementById('paywall-wrapper-iframe-estadao');
-    removeDOMElement(paywall);
+    let ads = document.querySelectorAll('div[class^="styles__Container-sc-"]');
+    removeDOMElement(paywall, ...ads);
   }
 }
 

custom/sites_custom.json

@@ -134,6 +134,11 @@
     "domain": "lsa-conso.fr",
     "useragent": "googlebot"
   },
+  "Lyrik.fr": {
+    "allow_cookies": 1,
+    "block_regex": "\\.qiota\\.com",
+    "domain": "lyrik.fr"
+  },
   "Mailplus.co.uk": {
     "allow_cookies": 1,
     "block_regex": "\\.tinypass\\.com\\/",
@@ -178,6 +183,11 @@
     "block_regex": "\\.tinypass\\.com\\/",
     "domain": "schweizer-illustrierte.ch"
   },
+  "Siliconrepublic.com": {
+    "allow_cookies": 1,
+    "block_regex": "js\\.pelcro\\.com",
+    "domain": "siliconrepublic.com"
+  },
   "Speld.nl": {
     "domain": "speld.nl"
   },
@@ -246,3 +256,4 @@
     "domain": "washingtontimes.com"
   }
 }
+

sites.js

@@ -1341,7 +1341,7 @@ var defaultSites = {
   },
   "O Estado de S. Paulo": {
     domain: "estadao.com.br",
-    block_regex: /(acesso\.estadao\.com\.br\/paywall\/.+\/.+\.js|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/
+    block_regex: /(acesso\.estadao\.com\.br\/paywall\/.+\/.+\.js|cdn\.ampproject\.org\/v\d\/amp-(access|subscriptions)-.+\.js)/
   },
   "O Globo (& Valor Econômico; cached articles only)": {
     domain: "globo.com",

sites_updated.json

@@ -49,6 +49,11 @@
     "allow_cookies": 1,
     "block_regex": "\\.qiota\\.com\\/"
   },
+  "O Estado de S. Paulo": {
+    "domain": "estadao.com.br",
+    "block_regex": "(acesso\\.estadao\\.com\\.br\\/paywall\\/.+\\/.+\\.js|cdn\\.ampproject\\.org\\/v\\d\\/amp-(access|subscriptions)-.+\\.js)",
+    "amp_unhide": 1
+  },
   "Private Equity News": {
     "domain": "penews.com",
     "useragent": "googlebot"