From d2691935433a806bac6708b7c97ebb6f757be7a8 Mon Sep 17 00:00:00 2001
From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com>
Date: Fri, 21 Oct 2022 12:44:02 +0200
Subject: [PATCH] Fix ABC.es (Sevilla)

---
 background.js      |  1 +
 changelog.txt      |  1 +
 contentScript.js   |  2 +-
 manifest.json      |  2 +-
 sites.js           |  9 ++++++++-
 sites_updated.json | 28 ++++++++++++++++++++++++++++
 6 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/background.js b/background.js
index d0fbb8c..585e210 100644
--- a/background.js
+++ b/background.js
@@ -1024,6 +1024,7 @@ if (matchUrlDomain(au_news_corp_domains, details.url))
 if (matchUrlDomain(change_headers, details.url) && !ignore_types.includes(details.type)) {
   var mobile = details.requestHeaders.filter(x => x.name.toLowerCase() === "user-agent" && x.value.toLowerCase().includes("mobile")).length;
   var googlebotEnabled = matchUrlDomain(use_google_bot, details.url) && 
+    !(matchUrlDomain('abc.es', details.url) && mobile) &&
     !(matchUrlDomain('barrons.com', details.url) && enabledSites.includes('#options_disable_gb_barrons')) &&
     !(matchUrlDomain(['economictimes.com', 'economictimes.indiatimes.com'], details.url) && !details.url.split(/\?|#/)[0].endsWith('.cms')) &&
     !(matchUrlDomain('theaustralian.com.au', details.url) && !details.url.startsWith('https://www.theaustralian.com.au/the-oz/')) &&
diff --git a/changelog.txt b/changelog.txt
index 84dcc77..cbf6559 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,7 @@
 Changelog Bypass Paywalls Clean - Firefox
 
 Post-release
+Fix ABC.es (Sevilla)
 Fix ESPN USA (link to archive.is)
 Fix The Athletic (css)
 
diff --git a/contentScript.js b/contentScript.js
index 0008279..fb234a2 100644
--- a/contentScript.js
+++ b/contentScript.js
@@ -1075,7 +1075,7 @@ else if (matchDomain('elperiodico.com')) {
 }
 
 else if (matchDomain(es_grupo_vocento_domains)) {
-  let paywall = document.querySelector('.voc-paywall, .container-wall-exclusive');
+  let paywall = document.querySelector('.voc-paywall, .container-wall-exclusive, .cierre-suscripcion:not([style="display: none;"])');
   if (!window.location.pathname.endsWith('_amp.html')) {
     let amphtml = document.querySelector('link[rel="amphtml"]');
     if (!amphtml)
diff --git a/manifest.json b/manifest.json
index e51e972..715e263 100644
--- a/manifest.json
+++ b/manifest.json
@@ -720,5 +720,5 @@
     "*://gcm.omerlocdn.com/*",
     "*://webcache.googleusercontent.com/*"
   ],
-  "version": "2.8.9.2"
+  "version": "2.8.9.3"
 }
diff --git a/sites.js b/sites.js
index dbc41d2..0c449ad 100644
--- a/sites.js
+++ b/sites.js
@@ -754,7 +754,14 @@ var defaultSites = {
       "lavozdigital.es"
     ],
     allow_cookies: 1,
-    block_regex: /(\.evolok\.net\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/
+    block_regex: /(\.evolok\.net\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/,
+    exception: [{
+        domain: "abc.es",
+        allow_cookies: 1,
+        block_regex: /(\.evolok\.net\/|cdn\.ampproject\.org\/v\d\/amp-access-.+\.js)/,
+        useragent: "googlebot"
+      }
+    ]
   },
   "Gruppo GEDI.it": {
     domain: "###_it_gedi",
diff --git a/sites_updated.json b/sites_updated.json
index f81ba50..55f281b 100644
--- a/sites_updated.json
+++ b/sites_updated.json
@@ -9,6 +9,34 @@
     "block_regex": "(\\.tinypass\\.com\\/|assets\\.bwbx\\.io\\/s\\d\\/(fence\\/plug-client|javelin\\/.+\\/transporter)\\/)",
     "remove_cookies_select_drop": ["gatehouse_id"]
   },
+  "Grupo Vocento": {
+    "domain": "###_es_grupo_vocento",
+    "group": [
+      "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"
+    ],
+    "allow_cookies": 1,
+    "block_regex": "(\\.evolok\\.net\\/|cdn\\.ampproject\\.org\\/v\\d\\/amp-access-.+\\.js)",
+    "exception": [{
+        "domain": "abc.es",
+        "allow_cookies": 1,
+        "block_regex": "(\\.evolok\\.net\\/|cdn\\.ampproject\\.org\\/v\\d\\/amp-access-.+\\.js)",
+        "useragent": "googlebot",
+        "amp_redirect": ".cierre-suscripcion:not([style=\"display: none;\"]"
+      }
+    ]
+  },
   "Inews.co.uk": {
     "domain": "inews.co.uk",
     "allow_cookies": 1,