From 089b812e81ccb24943dbc0f6fd3f08bb0a2516c7 Mon Sep 17 00:00:00 2001
From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com>
Date: Sun, 24 Jul 2022 08:50:03 +0200
Subject: [PATCH] Fix Folha de S. Paulo (piaui)

---
 changelog.txt            |  1 +
 contentScript.js         | 21 +++++++++++++++++----
 custom/sites_custom.json |  5 +++++
 manifest.json            |  2 +-
 sites_updated.json       | 14 ++++++++++++++
 5 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index b5be4cf..565b2b2 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -5,6 +5,7 @@ Post-release
 Add Saltwire Network (Canada)
 Add StuDocu (no downloads)
 Remove The Ken (fix not working)
+Fix Folha de S. Paulo (piaui)
 Fix Foreign Affairs (js)
 Fix Krautreporter.de
 Fix Le Devoir (cookie)
diff --git a/contentScript.js b/contentScript.js
index c516626..c0424da 100644
--- a/contentScript.js
+++ b/contentScript.js
@@ -2389,11 +2389,24 @@ else if (matchDomain('estadao.com.br')) {
 }
 
 else if (matchDomain('folha.uol.com.br')) {
-  if (window.location.pathname.startsWith('/amp/')) {
-    amp_unhide_subscr_section('amp-ad, amp-sticky-ad, amp-embed');
+  if (matchDomain('piaui.folha.uol.com.br')) {
+    if (window.location.search.startsWith('?amp')) {
+      amp_unhide_subscr_section();
+    } else {
+      let paywall = document.querySelector('.revista--interna__assineonly');
+      let amphtml = document.querySelector('link[rel="amphtml"]');
+      if (paywall && amphtml) {
+        removeDOMElement(paywall);
+        window.location.href = amphtml.href;
+      }
+    }
   } else {
-    let signup = document.querySelector('.c-top-signup');
-    removeDOMElement(signup);
+    if (window.location.pathname.startsWith('/amp/')) {
+      amp_unhide_subscr_section('amp-ad, amp-sticky-ad, amp-embed');
+    } else {
+      let signup = document.querySelector('.c-top-signup');
+      removeDOMElement(signup);
+    }
   }
 }
 
diff --git a/custom/sites_custom.json b/custom/sites_custom.json
index aff0b18..6c9b5ac 100644
--- a/custom/sites_custom.json
+++ b/custom/sites_custom.json
@@ -61,6 +61,11 @@
     "block_regex": "\\.tinypass\\.com\\/",
     "domain": "heraldscotland.com"
   },
+  "Inews.co.uk": {
+    "allow_cookies": 1,
+    "block_regex": "\\.tinypass\\.com\\/",
+    "domain": "inews.co.uk"
+  },
   "Internationalepolitik.de": {
     "allow_cookies": 1,
     "domain": "internationalepolitik.de"
diff --git a/manifest.json b/manifest.json
index 2c56108..8b163e1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -694,5 +694,5 @@
     "*://*.wsj.net/*",
     "*://webcache.googleusercontent.com/*"
   ],
-  "version": "2.7.6.6"
+  "version": "2.7.6.7"
 }
diff --git a/sites_updated.json b/sites_updated.json
index 2e1aacc..24a54b6 100644
--- a/sites_updated.json
+++ b/sites_updated.json
@@ -1,4 +1,18 @@
 {
+  "Folha de S. Paulo": {
+    "domain": "###_br_folha",
+    "group": [
+      "folha.uol.com.br",
+      "blogfolha.uol.com.br"
+    ],
+    "allow_cookies": 1,
+    "block_regex": "(\\.folha\\.uol\\.com\\.br\\/paywall\\/js\\/|paywall\\.folha\\.uol\\.com\\.br\\/|js\\.matheranalytics\\.com\\/|cdn\\.ampproject\\.org\\/v\\d\\/amp-subscriptions-.+\\.js)",
+    "useragent": "googlebot",
+    "amp_redirect": {
+      "paywall": ".revista--interna__assineonly"
+    },
+    "amp_unhide": 1
+  },
   "Foreign Affairs": {
     "domain": "foreignaffairs.com",
     "block_regex": "\\.foreignaffairs\\.com\\/modules\\/custom\\/fa_paywall_js\\/js\\/paywall\\.js"