Fix-update Funke Medien (obfuscated)

Plus Bloomberg (cookie/consent)

README.md

@@ -426,17 +426,17 @@ If removing the cookies works you can also add the site as a custom site.
 You can submit a request for a new website [here](https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean/-/issues).  
 Please read the following instructions and share your results for a quicker process.  
 Remember to check the [previous requests](https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean/-/issues) before asking for a new website.  
-1. Visit an article on the site you want to bypass the paywall for and copy the article title.  
-2. Open up a new incognito window (Ctrl+Shift+P) and paste the article title into Google.  
-3. Click on the same article from the Google search results page. Or you can:  
-4. Disable javascript on the website by clicking the button right icon </> on the uBlock Origin panel.  
+1. Visit an article on the site you want to bypass the paywall for and copy the article title.
+2. Open up a new incognito window (Ctrl+Shift+P) and paste the article title into Google.
+3. Click on the same article from the Google search results page. Or you can:
+4. Disable javascript on the website by clicking the button right icon </> on the uBlock Origin panel.
 5. Refresh the page.
 
 ### Add custom site
 Add your own custom site (also for testing).  
 Check 'Options'-link in popup-menu and go to custom sites.  
 * by default BPC has limited permissions, but you can opt-in to enable custom sites (and also clear cookies for non-listed sites).  
-Make sure the (new) site is checked under Options (or check on/off-button). 
+Make sure the (new) site is checked under Options (or check on/off-button).  
 By default sites' cookies/local storage are removed after page loads (to bypass article limit).  
 Also you can enable Googlebot user-agent or disable Javascript for (sub)domain(s)/external sources.
 

background.js

@@ -31,7 +31,6 @@ const restrictions = {
 var allow_cookies_default = [
   'abc.es',
   'belfasttelegraph.co.uk',
-  'bloomberg.com',
   'bostonglobe.com',
   'business-standard.com',
   'charliehebdo.fr',
@@ -118,6 +117,7 @@ var remove_cookies = [
 // select specific cookie(s) to hold from remove_cookies domains
 const remove_cookies_select_hold = {
   'barrons.com': ['wsjregion'],
+  'bloomberg.com': ['consentUUID'],
   'groene.nl': ['accept-cookies', 'popunder-hidden'],
   'newstatesman.com': ['STYXKEY_nsversion'],
   'seattletimes.com': ['st_newsletter_splash_seen'],

changelog.txt

@@ -4,6 +4,7 @@ Changelog Bypass Paywalls Clean - Firefox
 Post-release
 Add Groupe EBRA (France)
 Add Groupe La Dépêche (France)
+Fix-update Funke Medien (obfuscated)
 
 * v1.9.8.0 (2020-12-06)
 Add El Comercio, Ideal & La Voz de Cadiz (Spain)

contentScript.js

@@ -384,8 +384,6 @@ else if (matchDomain("bloomberg.com")) {
     let paywall_overlay = document.querySelector('div#graphics-paywall-overlay');
     let banner = document.getElementById('paywall-banner');
     removeDOMElement(banner, paywall_overlay);
-    if (banner)
-        csDone = true;
 }
 
 else if (matchDomain("bloombergquint.com")) {
@@ -1847,6 +1845,18 @@ else if ((domain = matchDomain(fr_groupe_ebra_domains)) && window.location.href.
     }
 }
 
+else if (matchDomain(["nrz.de", "waz.de", "wp.de", "wr.de"])) {
+    let obfuscated_elems = document.querySelectorAll('.obfuscated');
+    let parser = new DOMParser();
+    for (let obfuscated_elem of obfuscated_elems) {
+        let html = parser.parseFromString('<div>' + deobfuscateFUNKE(obfuscated_elem.innerText) + '</div>', 'text/html');
+        let par = html.querySelector('div');
+        obfuscated_elem.classList.remove('obfuscated');
+        obfuscated_elem.innerHTML = '';
+        obfuscated_elem.appendChild(par);
+    }
+}
+
 else
     csDone = true;
 
@@ -1927,7 +1937,7 @@ function pageContains(selector, text) {
 
 function parseHtmlEntities(encodedString) {
     var translate_re = /&(nbsp|amp|quot|lt|gt|deg|hellip|laquo|raquo|ldquo|rdquo|lsquo|rsquo|mdash);/g;
-    var translate = {"nbsp": " ", "amp": "&", "quot": "\"", "lt": "<", "gt": ">", "deg": "°", "hellip": "…", 
+    var translate = {"nbsp": " ", "amp": "&", "quot": "\"", "lt": "<", "gt": ">", "deg": "°", "hellip": "…",
         "laquo": "«", "raquo": "»", "ldquo": "“", "rdquo": "”", "lsquo": "‘", "rsquo": "’", "mdash": "—"};
     return encodedString.replace(translate_re, function (match, entity) {
         return translate[entity];
@@ -1936,3 +1946,8 @@ function parseHtmlEntities(encodedString) {
         return String.fromCharCode(num);
     });
 }
+
+function deobfuscateFUNKE(str) {
+    return str.replace(/[0-9A-ZÅÝÀµ×#@$²±:`^'´\\,{[/.÷;=?)*\-]/gi, c =>
+        '012345678@ABCDEFGHIJKLMNOPQRSTUVWXYÄöÜẞZzabcdefghijklmnopqrstuvwxyäüößz,+.-:<>/()!"=[;9]&_?%#\''['123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÅ×ÝÀ[abcdefghijklmnopqrstuvwxyzåý÷à{-,/.;=?0)*²#µ\\´:^\'`@±$'.indexOf(c)])
+}