Fix Funke Mediengruppe (amp)

changelog.txt

@@ -4,6 +4,7 @@ Changelog Bypass Paywalls Clean - Firefox
 Post-release
 Add Koelner Stadt-Anzeiger & Koelnische Rundschau
 Add The (New Orleans) Advocate
+Fix Funke Mediengruppe (amp)
 Fix Lecho.be (separate from Groupe Rossel)
 Fix Repubblica sites (no amp)
 Fix USA Today & Gannett Group (amp)

contentScript.js

@@ -358,19 +358,6 @@ else if (matchDomain('augsburger-allgemeine.de')) {
     }
   } else {
     amp_unhide_subscr_section();
-    let amp_iframes = document.querySelectorAll('amp-iframe');
-    let elem;
-    for (let amp_iframe of amp_iframes) {
-      elem = document.createElement('iframe');
-      elem.src = amp_iframe.getAttribute('src');
-      elem.setAttribute('frameborder', '0');
-      if (amp_iframe.getAttribute('height') && amp_iframe.getAttribute('width')) {
-        elem.setAttribute('height', amp_iframe.getAttribute('height'));
-        elem.setAttribute('width', amp_iframe.getAttribute('width'));
-      }
-      amp_iframe.parentElement.insertBefore(elem, amp_iframe);
-      removeDOMElement(amp_iframe);
-    }
   }
 }
 
@@ -413,7 +400,10 @@ else if (matchDomain('cicero.de')) {
 }
 
 else if (matchDomain(de_funke_media_domains)) {
-  sessionStorage.setItem('deobfuscate', 'true');
+  if (window.location.search.startsWith('?service=amp'))
+    amp_unhide_access_hide('="NOT p.showRegWall AND NOT p.showPayWall"', '', 'amp-ad, amp-embed, amp-fx-flying-carpet');
+  else
+    sessionStorage.setItem('deobfuscate', 'true');
 }
 
 else if (matchDomain('deutsche-wirtschafts-nachrichten.de')) {

sites.js

@@ -494,7 +494,7 @@ var defaultSites = {
     ],
     allow_cookies: 1,
     useragent: "googlebot",
-    block_regex: /(cdn\.cxense\.com\/|\.tinypass\.com\/)/
+    block_regex: /(\.tinypass\.com\/|cdn\.ampproject\.org\/v\d\/amp-(access|(sticky-)?ad|fx-flying-carpet)-.+\.js)/
   },
   "Gannett Group (local USA Today)": {
     domain: "###_usa_gannett",