From 41e40e1d040af9427dde1f0b30fd5ef1a2105800 Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Mon, 8 May 2023 09:04:58 +0200 Subject: [PATCH] Remove Medienhaus Aachen --- README.md | 3 --- background.js | 4 ++-- changelog.txt | 1 + contentScript.js | 2 +- contentScript_once.js | 2 ++ custom/manifest.json | 2 +- custom/sites_custom.json | 12 +++--------- manifest.json | 4 +--- sites.js | 12 +----------- 9 files changed, 12 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index ba05f094..b40658da 100644 --- a/README.md +++ b/README.md @@ -589,9 +589,6 @@ Grouped in options:\ [Neue Presse (Hannover)](https://www.neuepresse.de) - [Ostsee-Zeitung](https://www.ostsee-zeitung.de) - [RedaktionsNetzwerk Deutschland](https://www.rnd.de)\ -*Medienhaus Aachen* sites like\ -[Aachener Nachrichten](https://www.aachener-nachrichten.de) - -[Aachener Zeitung](https://www.aachener-zeitung.de)\ *NOZ/MHN Mediengruppe* sites like\ [Neue Osnabrücker Zeitung](https://www.noz.de) - [Schleswig-Holsteinischer Zeitungsverlag](https://www.shz.de) - diff --git a/background.js b/background.js index 0b603416..da730fcc 100644 --- a/background.js +++ b/background.js @@ -417,7 +417,7 @@ ext_api.storage.local.get({ } else { ext_api.management.getSelf(function (result) { if ((result.installType === 'development' || (result.installType !== 'development' && !enabledSites.includes('#options_on_update')))) { - let new_groups = ['###_ar_grupo_clarin', '###_be_groupe_ipm', '###_be_roularta', '###_de_mh_aachen', '###_de_noz_mhn', '###_uk_nat_world']; + let new_groups = ['###_ar_grupo_clarin', '###_be_groupe_ipm', '###_be_roularta', '###_de_noz_mhn', '###_uk_nat_world']; let open_options = new_groups.some(group => !enabledSites.includes(group) && grouped_sites[group].some(domain => enabledSites.includes(domain) && !customSites_domains.includes(domain))) || (enabledSites.includes('tinypass.com') && !enabledSites.includes('piano.io')); if (open_options) @@ -1331,7 +1331,7 @@ ext_api.runtime.onMessage.addListener(function (message, sender) { let custom_domain = message.data.domain; let group = message.data.group; if (group) { - let nofix_groups = ['###_ch_tamedia', '###_fi_alma_talent', '###_it_citynews']; + let nofix_groups = ['###_ch_tamedia', '###_de_rp_aachen_medien', '###_fi_alma_talent', '###_it_citynews']; if (!custom_flex_domains.includes(custom_domain)) { if (enabledSites.includes(group)) { let rules; diff --git a/changelog.txt b/changelog.txt index a50009d3..1077054a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,7 @@ Changelog Bypass Paywalls Clean - Firefox Updates (install signed xpi-file): https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean/-/releases Post-release +Remove Medienhaus Aachen (fix obsolete) * v3.1.7.0 (2023-05-07) Add Cairns Post, Geelong Advertiser & Townsville Bulletin (Australia News Corp) diff --git a/contentScript.js b/contentScript.js index 0fe1f71d..ed867ad8 100644 --- a/contentScript.js +++ b/contentScript.js @@ -47,7 +47,7 @@ var usa_outside_mag_domains = ["backpacker.com", "betamtb.com", "betternutrition var usa_tribune_domains = ['baltimoresun.com', 'chicagotribune.com', 'courant.com', 'dailypress.com', 'mcall.com', 'nydailynews.com', 'orlandosentinel.com', 'pilotonline.com', 'sun-sentinel.com']; // clean local storage of sites (with an exemption for hold-list) -var arr_localstorage_hold = ['aachener-nachrichten.de', 'aachener-zeitung.de', 'allgaeuer-zeitung.de', 'augsburger-allgemeine.de', 'barrons.com', 'businessinsider.com', 'businessoffashion.com', 'businesspost.ie', 'challenges.fr', 'charliehebdo.fr', 'cmjornal.pt', 'corriere.it', 'corrieredellosport.it', 'cyclingtips.com', 'dvhn.nl', 'economictimes.com', 'eldiario.es', 'elespanol.com', 'elle.fr', 'elpais.com', 'elperiodico.com', 'enotes.com', 'estadao.com.br', 'forbes.com', 'fortune.com', 'freiepresse.de', 'globo.com', 'ilfoglio.it', 'inc42.com', 'indianexpress.com', 'ksta.de', 'kurier.at', 'lanouvellerepublique.fr', 'latimes.com', 'lc.nl', 'lesechos.fr', 'livemint.com', 'mid-day.com', 'mundodeportivo.com', 'nationalreview.com', 'nw.de', 'nytimes.com', 'nzherald.co.nz', 'record.pt', 'rundschau-online.de', 'sandiegouniontribune.com', 'scmp.com', 'seekingalpha.com', 'telegraph.co.uk', 'tes.com', 'theatlantic.com', 'thebulletin.org', 'thecritic.co.uk', 'thetimes.co.uk', 'uol.com.br', 'wsj.com'].concat(be_roularta_domains, ca_gcm_domains, de_funke_medien_domains, de_lv_domains, de_westfalen_medien_domains, es_epiberica_domains, es_epiberica_custom_domains, es_grupo_vocento_domains, es_unidad_domains, fr_groupe_ebra_domains, fr_groupe_la_depeche_domains, fr_groupe_nice_matin_domains, it_gedi_domains, it_quotidiano_domains, ca_gcm_domains, nl_dpg_media_domains, no_nhst_media_domains, timesofindia_domains, usa_hearst_comm_domains, usa_mcc_domains); +var arr_localstorage_hold = ['allgaeuer-zeitung.de', 'augsburger-allgemeine.de', 'barrons.com', 'businessinsider.com', 'businessoffashion.com', 'businesspost.ie', 'challenges.fr', 'charliehebdo.fr', 'cmjornal.pt', 'corriere.it', 'corrieredellosport.it', 'cyclingtips.com', 'dvhn.nl', 'economictimes.com', 'eldiario.es', 'elespanol.com', 'elle.fr', 'elpais.com', 'elperiodico.com', 'enotes.com', 'estadao.com.br', 'forbes.com', 'fortune.com', 'freiepresse.de', 'globo.com', 'ilfoglio.it', 'inc42.com', 'indianexpress.com', 'ksta.de', 'kurier.at', 'lanouvellerepublique.fr', 'latimes.com', 'lc.nl', 'lesechos.fr', 'livemint.com', 'mid-day.com', 'mundodeportivo.com', 'nationalreview.com', 'nw.de', 'nytimes.com', 'nzherald.co.nz', 'record.pt', 'rundschau-online.de', 'sandiegouniontribune.com', 'scmp.com', 'seekingalpha.com', 'telegraph.co.uk', 'tes.com', 'theatlantic.com', 'thebulletin.org', 'thecritic.co.uk', 'thetimes.co.uk', 'uol.com.br', 'wsj.com'].concat(be_roularta_domains, ca_gcm_domains, de_funke_medien_domains, de_lv_domains, de_westfalen_medien_domains, es_epiberica_domains, es_epiberica_custom_domains, es_grupo_vocento_domains, es_unidad_domains, fr_groupe_ebra_domains, fr_groupe_la_depeche_domains, fr_groupe_nice_matin_domains, it_gedi_domains, it_quotidiano_domains, ca_gcm_domains, nl_dpg_media_domains, no_nhst_media_domains, timesofindia_domains, usa_hearst_comm_domains, usa_mcc_domains); if (!matchDomain(arr_localstorage_hold)) { window.localStorage.clear(); } diff --git a/contentScript_once.js b/contentScript_once.js index b8a26afc..0b9ed04b 100644 --- a/contentScript_once.js +++ b/contentScript_once.js @@ -60,6 +60,8 @@ window.setTimeout(function () { group = '###_de_madsack'; else if (document.querySelector('script[src*="/dfv.containers.piwik.pro/"]')) group = '###_de_dfv_medien'; + else if (matchDomain(['aachener-nachrichten.de', 'aachener-zeitung.de', 'ga.de', 'rp-online.de', 'saarbruecker-zeitung.de', 'volksfreund.de'])) + group = '###_de_rp_aachen_medien';// no fix else if (document.querySelector('meta[name^="cXenseParse:vrm-"]')) group = '###_de_vrm'; else if (document.querySelector('link[href*="/assets.static-chmedia.ch/"]')) diff --git a/custom/manifest.json b/custom/manifest.json index d9db8837..23ab4932 100644 --- a/custom/manifest.json +++ b/custom/manifest.json @@ -51,5 +51,5 @@ "webRequestBlocking", "*://*/*" ], - "version": "3.1.7.0" + "version": "3.1.7.1" } diff --git a/custom/sites_custom.json b/custom/sites_custom.json index 1d60f756..d4c43096 100644 --- a/custom/sites_custom.json +++ b/custom/sites_custom.json @@ -496,17 +496,11 @@ "allow_cookies": 1, "domain": "risk.net" }, - "Rp-online.de": { - "add_ext_link": "div.paid-content|article", + "Rp_aachen_medien": { + "add_ext_link": "div.paid-content,span.park-widget|article", "add_ext_link_type": "google_search_tool", "allow_cookies": 1, - "domain": "rp-online.de" - }, - "Saarbruecker-zeitung.de": { - "add_ext_link": "div.paid-content|article", - "add_ext_link_type": "google_search_tool", - "allow_cookies": 1, - "domain": "saarbruecker-zeitung.de" + "domain": "###_de_rp_aachen_medien" }, "Saechsische.de": { "add_ext_link": "div#piano-inline|div.article-detail-content>p", diff --git a/manifest.json b/manifest.json index 5941bad2..d24ef93d 100644 --- a/manifest.json +++ b/manifest.json @@ -54,8 +54,6 @@ "webRequestBlocking", "*://*.360dx.com/*", "*://*.60millions-mag.com/*", - "*://*.aachener-nachrichten.de/*", - "*://*.aachener-zeitung.de/*", "*://*.abc.es/*", "*://*.abendblatt.de/*", "*://*.abqjournal.com/*", @@ -756,5 +754,5 @@ "*://html.onlineviewer.net/*", "*://webcache.googleusercontent.com/*" ], - "version": "3.1.7.0" + "version": "3.1.7.1" } diff --git a/sites.js b/sites.js index 8bf62edf..38b2ed88 100644 --- a/sites.js +++ b/sites.js @@ -1329,15 +1329,6 @@ var defaultSites = { allow_cookies: 1, block_regex: /(\.blueconic\.net\/|\.tinypass\.com\/|\/loader-wp\/.+\/loader\.min\.js|cdn\.ampproject\.org\/v\d\/amp-subscriptions-.+\.js)/ }, - "Medienhaus Aachen": { - domain: "###_de_mh_aachen", - group: [ - "aachener-nachrichten.de", - "aachener-zeitung.de" - ], - allow_cookies: 1, - useragent: "facebookbot" - }, "Medium": { domain: "medium.com", allow_cookies: 1, @@ -2548,6 +2539,5 @@ init_custom_flex_domains(); // sites with no fix (background) var be_mediahuis_nofix_domains = ['gva.be', 'hbvl.be', 'nieuwsblad.be', 'standaard.be']; -var de_rp_medien_nofix_domains = ['ga.de', 'rp-online.de', 'saarbruecker-zeitung.de', 'volksfreund.de']; var it_gedi_nofix_domains = ['gelocal.it', 'huffingtonpost.it', 'ilsecoloxix.it', 'lastampa.it', 'limesonline.com', 'repubblica.it']; -var nofix_sites = ['aamulehti.fi', 'africaintelligence.com', 'africaintelligence.fr', 'aftenposten.no', 'asiatimes.com', 'badische-zeitung.de', 'bild.de', 'bloomberglaw.com', 'bloombergtax.com', 'borsen.dk', 'business-standard.com', 'businessinsider.de', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'caravanmagazine.in', 'catalyst-journal.com', 'courrierinternational.com', 'deutsche-wirtschafts-nachrichten.de', 'diepresse.com', 'dn.se', 'elordenmundial.com', 'epw.in', 'expresso.pt', 'finance.si', 'ftchinese.com', 'gamestar.de', 'golem.de', 'handelsblatt.com', 'heise.de', 'hln.be', 'hs.fi', 'ilsole24ore.com', 'investors.com', 'iltalehti.fi', 'jacobinmag.com', 'jeuneafrique.com', 'kleinezeitung.at', 'lavie.fr', 'lavozdegalicia.es', 'law360.com', 'le1hebdo.fr', 'leconomiste.com', 'lemonde.fr', 'lequipe.fr', 'letemps.ch', 'liberation.fr', 'lopinion.fr', 'medianama.com', 'mediapart.fr', 'milanofinanza.it', 'mittelbayerische.de', 'monde-diplomatique.fr', 'mondediplo.com', 'moneycontrol.com', 'nationaljournal.com', 'nature.com', 'nbr.co.nz', 'nknews.org', 'nn.de', 'nwzonline.de', 'ouest-france.fr', 'philonomist.com', 'pnp.de', 'politicopro.com', 'politiken.dk', 'pressreader.com', 'publico.pt', 'puck.news', 'republic.ru', 'rheinpfalz.de', 'risk.net', 'rnz.de', 'ruhrnachrichten.de', 'saechsische.de', 'schwarzwaelder-bote.de', 'statnews.com', 'stern.de', 'stimme.de', 'straitstimes.com', 'stuttgarter-nachrichten.de', 'stuttgarter-zeitung.de', 'suedkurier.de', 'swp.de', 'techcrunch.com', 'the-ken.com', 'thedispatch.com', 'theinformation.com', 'themorningcontext.com', 'theparisreview.org', 'thewirechina.com', 'welt.de', 'weser-kurier.de', 'wiwo.de', 'worldpoliticsreview.com', 'ynet.co.il', 'zeit.de'].concat(be_mediahuis_nofix_domains, de_rp_medien_nofix_domains, it_gedi_nofix_domains); +var nofix_sites = ['aamulehti.fi', 'africaintelligence.com', 'africaintelligence.fr', 'aftenposten.no', 'asiatimes.com', 'badische-zeitung.de', 'bild.de', 'bloomberglaw.com', 'bloombergtax.com', 'borsen.dk', 'business-standard.com', 'businessinsider.de', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'caravanmagazine.in', 'catalyst-journal.com', 'courrierinternational.com', 'deutsche-wirtschafts-nachrichten.de', 'diepresse.com', 'dn.se', 'elordenmundial.com', 'epw.in', 'expresso.pt', 'finance.si', 'ftchinese.com', 'gamestar.de', 'golem.de', 'handelsblatt.com', 'heise.de', 'hln.be', 'hs.fi', 'ilsole24ore.com', 'investors.com', 'iltalehti.fi', 'jacobinmag.com', 'jeuneafrique.com', 'kleinezeitung.at', 'lavie.fr', 'lavozdegalicia.es', 'law360.com', 'le1hebdo.fr', 'leconomiste.com', 'lemonde.fr', 'lequipe.fr', 'letemps.ch', 'liberation.fr', 'lopinion.fr', 'medianama.com', 'mediapart.fr', 'milanofinanza.it', 'mittelbayerische.de', 'monde-diplomatique.fr', 'mondediplo.com', 'moneycontrol.com', 'nationaljournal.com', 'nature.com', 'nbr.co.nz', 'nknews.org', 'nn.de', 'nwzonline.de', 'ouest-france.fr', 'philonomist.com', 'pnp.de', 'politicopro.com', 'politiken.dk', 'pressreader.com', 'publico.pt', 'puck.news', 'republic.ru', 'rheinpfalz.de', 'risk.net', 'rnz.de', 'ruhrnachrichten.de', 'saechsische.de', 'schwarzwaelder-bote.de', 'statnews.com', 'stern.de', 'stimme.de', 'straitstimes.com', 'stuttgarter-nachrichten.de', 'stuttgarter-zeitung.de', 'suedkurier.de', 'swp.de', 'techcrunch.com', 'the-ken.com', 'thedispatch.com', 'theinformation.com', 'themorningcontext.com', 'theparisreview.org', 'thewirechina.com', 'welt.de', 'weser-kurier.de', 'wiwo.de', 'worldpoliticsreview.com', 'ynet.co.il', 'zeit.de'].concat(be_mediahuis_nofix_domains, it_gedi_nofix_domains);