From e4ca1bf71e74cabe0afd85bcd989cbe6a1341500 Mon Sep 17 00:00:00 2001
From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com>
Date: Wed, 12 Oct 2022 09:03:55 +0200
Subject: [PATCH] Fix Bloomberg (edition)

---
 changelog.txt      |  1 +
 contentScript.js   |  7 +++----
 manifest.json      |  2 +-
 sites.js           |  2 +-
 sites_updated.json | 38 ++++----------------------------------
 5 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 07b1820..b382acc 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -3,6 +3,7 @@ Changelog Bypass Paywalls Clean - Firefox
 
 Post-release
 Fix ArcInfo.ch (refresh)
+Fix Bloomberg (edition)
 Fix The Hindu (geoId-fix redundant)
 
 * v2.8.8.0 (2022-10-09)
diff --git a/contentScript.js b/contentScript.js
index 344f9aa..eebba60 100644
--- a/contentScript.js
+++ b/contentScript.js
@@ -2563,15 +2563,14 @@ else if (matchDomain('bloomberg.com')) {
   function bloomberg_noscroll(node) {
     node.removeAttribute('data-paywall-overlay-status');
   }
-  waitDOMElement('div#fortress-paywall-container-root', 'DIV', removeDOMElement, true);
+  waitDOMElement('div[id^="fortress-"]', 'DIV', removeDOMElement, true);
   waitDOMAttribute('body', 'BODY', 'data-paywall-overlay-status', bloomberg_noscroll, true);
-  let paywall = document.querySelector('div#fortress-paywall-container-root');
-  let counter = document.querySelector('div#fortress-preblocked-container-root');
+  let paywall = document.querySelectorAll('div[id^="fortress-"]');
   let leaderboard = document.querySelector('div[id^="leaderboard"], div[class^="leaderboard"], div.canopy-container');
   let noscroll = document.querySelector('body[data-paywall-overlay-status]');
   if (noscroll)
     noscroll.removeAttribute('data-paywall-overlay-status');
-  removeDOMElement(paywall, counter, leaderboard);
+  removeDOMElement(...paywall, leaderboard);
   sessionStorage.clear();
   let url = window.location.href;
   if (url.match(/s\/\d{4}-/)) {
diff --git a/manifest.json b/manifest.json
index ca0a964..21a8b32 100644
--- a/manifest.json
+++ b/manifest.json
@@ -717,5 +717,5 @@
     "*://gcm.omerlocdn.com/*",
     "*://webcache.googleusercontent.com/*"
   ],
-  "version": "2.8.8.2"
+  "version": "2.8.8.3"
 }
diff --git a/sites.js b/sites.js
index 104c1aa..db6880b 100644
--- a/sites.js
+++ b/sites.js
@@ -208,7 +208,7 @@ var defaultSites = {
   "Bloomberg": {
     domain: "bloomberg.com",
     block_regex: /(\.tinypass\.com\/|assets\.bwbx\.io\/s\d\/(fence\/plug-client|javelin\/.+\/transporter)\/)/,
-    remove_cookies_select_hold: ["bb_geo_info"]
+    remove_cookies_select_drop: ["gatehouse_id"]
   },
   "BQ Prime": {
     domain: "bqprime.com",
diff --git a/sites_updated.json b/sites_updated.json
index 1acf0e9..0b2660f 100644
--- a/sites_updated.json
+++ b/sites_updated.json
@@ -1,18 +1,8 @@
 {
-  "Aachener Nachrichten": {
-    "domain": "aachener-nachrichten.de",
-    "allow_cookies": 1,
-    "useragent": "googlebot"
-  },
-  "Aachener Zeitung": {
-    "domain": "aachener-zeitung.de",
-    "allow_cookies": 1,
-    "useragent": "googlebot"
-  },
-  "Clarín": {
-    "domain": "clarin.com",
-    "allow_cookies": 1,
-    "block_regex": "\\.clarin\\.com\\/.+\\/auth\\d\\.js"
+  "Bloomberg": {
+    "domain": "bloomberg.com",
+    "block_regex": "(\\.tinypass\\.com\\/|assets\\.bwbx\\.io\\/s\\d\\/(fence\\/plug-client|javelin\\/.+\\/transporter)\\/)",
+    "remove_cookies_select_drop": ["gatehouse_id"]
   },
   "Corriere dello Sport": {
     "domain": "corrieredellosport.it",
@@ -23,26 +13,11 @@
     "allow_cookies": 1,
     "block_regex": "(\\.tinypass\\.com\\/|cdn\\.ampproject\\.org\\/v\\d\\/amp-access-.+\\.js)"
   },
-  "General-Anzeiger Bonn": {
-    "domain": "ga.de",
-    "allow_cookies": 1,
-    "useragent": "googlebot"
-  },
   "Medscape (regwall)": {
     "domain": "medscape.com",
     "allow_cookies": 1,
     "block_regex": "\\.medscapestatic\\.com\\/.+\\/medscape-library\\.js"
   },
-  "Rheinische Post": {
-    "domain": "rp-online.de",
-    "allow_cookies": 1,
-    "useragent": "googlebot"
-  },
-  "Saarbrücker Zeitung": {
-    "domain": "saarbruecker-zeitung.de",
-    "allow_cookies": 1,
-    "useragent": "googlebot"
-  },
   "The Critic": {
     "domain": "thecritic.co.uk",
     "block_regex": "\\.hadrianpaywall\\.com\\/"
@@ -51,10 +26,5 @@
     "domain": "washingtonpost.com",
     "allow_cookies": 1,
     "block_regex": "\\.washingtonpost\\.com\\/tetro\\/metering\\/evaluate"
-  },
-  "Trierischer Volksfreund": {
-    "domain": "volksfreund.de",
-    "allow_cookies": 1,
-    "useragent": "googlebot"
   }
 }