From cc8e1f14f3cc5256d54c61dc6fcff84798c84f54 Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Tue, 26 Dec 2023 08:19:04 +0100 Subject: [PATCH] Remove Haaretz Group --- README.md | 6 ------ background.js | 2 +- changelog.txt | 1 + custom/manifest.json | 2 +- custom/sites_custom.json | 17 +++++++++++++++++ manifest.json | 5 +---- sites.js | 13 ++----------- sites_updated.json | 33 +++++++++++++++++++++++++++++++++ 8 files changed, 56 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 90cbed1..06f3925 100644 --- a/README.md +++ b/README.md @@ -934,12 +934,6 @@ Grouped in options:\ [Globes](https://www.globes.co.il) - [The Jerusalem Post](https://www.jpost.com) -Grouped in options:\ -*Haaretz Group* sites like\ -[Haaretz.co.il](https://www.haaretz.co.il) - -[Haaretz.com](https://www.haaretz.com) - -[The Marker](https://www.themarker.com) - #### Latin America ##### Argentina diff --git a/background.js b/background.js index 4e382b0..162abc6 100644 --- a/background.js +++ b/background.js @@ -500,7 +500,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 = ['###_au_investsmart', '###_es_epiberica, ###_il_haaretz_group']; + let new_groups = ['###_au_investsmart', '###_es_epiberica']; let open_options = new_groups.some(group => !enabledSites.includes(group) && grouped_sites[group].some(domain => enabledSites.includes(domain) && !customSites_domains.includes(domain))); if (open_options) ext_api.runtime.openOptionsPage(); diff --git a/changelog.txt b/changelog.txt index 7955cad..9adf608 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 Haaretz Group (fix obsolete) Fix elDiario.es (amp-redirect) Fix S&P Global (js-inline) diff --git a/custom/manifest.json b/custom/manifest.json index 67cf605..62b1b4a 100644 --- a/custom/manifest.json +++ b/custom/manifest.json @@ -51,5 +51,5 @@ "webRequestBlocking", "*://*/*" ], - "version": "3.4.8.1" + "version": "3.4.8.2" } diff --git a/custom/sites_custom.json b/custom/sites_custom.json index bbdee54..faff658 100644 --- a/custom/sites_custom.json +++ b/custom/sites_custom.json @@ -252,6 +252,12 @@ "domain": "gramophone.co.uk", "useragent": "googlebot" }, + "Group_haaretz": { + "add_ext_link": "meta[property='og:url'][content*='/.premium/']|article p", + "add_ext_link_type": "google_search_tool", + "domain": "group_haaretz", + "group": "haaretz.co.il,haaretz.com,themarker.com" + }, "Group_media_source_inc": { "allow_cookies": 1, "block_regex": "\\.com\\/.+\\/js\\/metering\\.js", @@ -338,6 +344,11 @@ "block_regex": "\\.lasvegasadvisor\\.com\\/(opt\\/.+|js\\/access\\.min)\\.js", "domain": "lasvegasadvisor.com" }, + "Legalbites.in": { + "allow_cookies": 1, + "cs_code": "[{\"cond\":\"div#subscription_paid_message\", \"rm_elem\":1, \"elems\":[{\"cond\":\"div.hide.paywall-content\", \"rm_attrib\": \"class\"}, {\"cond\": \"div.restricted_message>div.story\", \"rm_elem\":1}]}]", + "domain": "legalbites.in" + }, "Limerickpost.ie": { "allow_cookies": 1, "block_regex": "\\.limerickpost\\.ie\\/.+\\/flip-pay\\.js", @@ -686,6 +697,12 @@ "block_regex": "\\.thefashionlaw\\.com\\/evolok\\/.+\\/ev-widgets\\.min\\.js", "domain": "thefashionlaw.com" }, + "Thefederal.com": { + "allow_cookies": 1, + "amp_redirect": "div#premium_access_message_text", + "cs_code": "[{\"cond\":\"div.access-message\", \"rm_elem\":1, \"elems\":[{\"cond\":\"div.hide.paywall-content\", \"rm_attrib\":\"class\"}]}]", + "domain": "thefederal.com" + }, "Themonthly.com.au": { "domain": "themonthly.com.au" }, diff --git a/manifest.json b/manifest.json index 0167be6..bda6efa 100644 --- a/manifest.json +++ b/manifest.json @@ -296,8 +296,6 @@ "*://*.granta.com/*", "*://*.groene.nl/*", "*://*.grubstreet.com/*", - "*://*.haaretz.co.il/*", - "*://*.haaretz.com/*", "*://*.handelszeitung.ch/*", "*://*.harpers.org/*", "*://*.harpersbazaar.com/*", @@ -677,7 +675,6 @@ "*://*.theintercept.com/*", "*://*.thejuggernaut.com/*", "*://*.thelawyersdaily.ca/*", - "*://*.themarker.com/*", "*://*.themarket.ch/*", "*://*.themercury.com.au/*", "*://*.thenation.com/*", @@ -824,5 +821,5 @@ "*://archive.vn/*", "*://webcache.googleusercontent.com/*" ], - "version": "3.4.8.1" + "version": "3.4.8.2" } diff --git a/sites.js b/sites.js index 8d3f4f9..8916a76 100644 --- a/sites.js +++ b/sites.js @@ -1030,16 +1030,6 @@ var defaultSites = { "lanuovasardegna.it" ] }, - "Haaretz Group": { - domain: "###_il_haaretz_group", - group: [ - "haaretz.co.il", - "haaretz.com", - "themarker.com" - ], - allow_cookies: 1, - useragent: "facebookbot" - }, "Haas Mediengruppe (opt-in to custom sites)": { domain: "###_de_haas_medien", group: [ @@ -2923,6 +2913,7 @@ var de_funke_medien_nofix_domains = ['braunschweiger-zeitung.de', 'harzkurier.de var de_rp_aachen_medien_nofix_domains = ['aachener-nachrichten.de', 'aachener-zeitung.de', 'ga.de', 'rp-online.de', 'saarbruecker-zeitung.de', 'volksfreund.de']; var fr_groupe_ebra_nofix_domains = ['bienpublic.com', 'dna.fr', 'estrepublicain.fr', 'lalsace.fr', 'ledauphine.com', 'lejsl.com', 'leprogres.fr', 'republicain-lorrain.fr', 'vosgesmatin.fr']; var fr_indigo_nofix_domains = ['africaintelligence.com', 'africaintelligence.fr', 'glitz.paris', 'intelligenceonline.com', 'intelligenceonline.fr', 'lalettre.fr']; +var il_haaretz_group_nofix_domains = ['haaretz.co.il', 'haaretz.com', 'themarker.com']; var it_gedi_nofix_domains = ['gelocal.it', 'huffingtonpost.it', 'limesonline.com']; var nl_mediahuis_region_nofix_domains = ['gooieneemlander.nl', 'haarlemsdagblad.nl', 'ijmuidercourant.nl', 'leidschdagblad.nl', 'noordhollandsdagblad.nl']; -var nofix_sites = ['aamulehti.fi', 'aftenposten.no', 'aftonbladet.se', 'allgaeuer-zeitung.de', 'asahi.com', 'asiatimes.com', 'autosport.com', 'aviationweek.com', 'badische-zeitung.de', 'bloomberglaw.com', 'bloombergtax.com', 'bnn.de', 'borsen.dk', 'businessinsider.de', 'businesslive.co.za', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'caravanmagazine.in', 'catalyst-journal.com', 'codesports.com.au', 'compactmag.com', 'courrierinternational.com', 'coursehero.com', 'deutsche-wirtschafts-nachrichten.de', 'die-glocke.de', 'dn.no', 'dn.se', 'elordenmundial.com', 'entrepreneur.com', 'epw.in', 'expresso.pt', 'falter.at', 'finance.si', 'ftchinese.com', 'ftchineselive.com', 'gamestar.de', 'geo.de', 'golem.de', 'gp.se', 'handelsblatt.com', 'hbrchina.org', 'hbrfrance.fr', 'heise.de', 'hln.be', 'hs.fi', 'ilsole24ore.com', 'information.dk', 'investors.com', 'iltalehti.fi', 'jacobin.com', 'jeuneafrique.com', 'jungefreiheit.de', 'kleinezeitung.at', 'lavie.fr', 'lavozdegalicia.es', 'law360.co.uk', 'law360.com', 'le1hebdo.fr', 'leconomiste.com', 'lefilmfrancais.com', 'lequipe.fr', 'lesjours.fr', 'letemps.ch', 'liberation.fr', 'limburger.nl', 'main-echo.de', 'mainpost.de', 'manager-magazin.de', 'medianama.com', 'mediapart.fr', 'milanofinanza.it', 'mittelbayerische.de', 'monde-diplomatique.fr', 'mondediplo.com', 'money.it', 'moneycontrol.com', 'moodys.com', 'morningstar.com', 'moz.de', 'nachrichten.at', 'nationaljournal.com', 'nature.com', 'nbr.co.nz', 'newslaundry.com', 'nn.de', 'nwzonline.de', 'observador.pt', 'ouest-france.fr', 'philonomist.com', 'pnp.de', 'politicopro.com', 'politiken.dk', 'pressreader.com', 'publico.pt', 'quillette.com', 'republic.ru', 'rheinpfalz.de', 'risk.net', 'rnz.de', 'saechsische.de', 'schwarzwaelder-bote.de', 'sciencedirect.com', 'springer.com', 'statnews.com', 'stern.de', 'stimme.de', 'straitstimes.com', 'stratfor.com', 'substack.com', 'suedkurier.de', 'swp.de', 'techcrunch.com', 'the-ken.com', 'theinformation.com', 'theinitium.com', 'themorningcontext.com', 'theparisreview.org', 'thestar.com.my', 'thewirechina.com', 'weltwoche.ch', 'weltwoche.de', 'wissenschaft.de', 'wiwo.de', 'worldpoliticsreview.com', 'ynet.co.il'].concat(be_mediahuis_nofix_domains, de_funke_medien_nofix_domains, de_rp_aachen_medien_nofix_domains, fr_groupe_ebra_nofix_domains, fr_indigo_nofix_domains, it_gedi_nofix_domains, nl_mediahuis_region_nofix_domains); +var nofix_sites = ['aamulehti.fi', 'aftenposten.no', 'aftonbladet.se', 'allgaeuer-zeitung.de', 'asahi.com', 'asiatimes.com', 'autosport.com', 'aviationweek.com', 'badische-zeitung.de', 'bloomberglaw.com', 'bloombergtax.com', 'bnn.de', 'borsen.dk', 'businessinsider.de', 'businesslive.co.za', 'businesstimes.com.sg', 'caixin.com', 'caixinglobal.com', 'caravanmagazine.in', 'catalyst-journal.com', 'codesports.com.au', 'compactmag.com', 'courrierinternational.com', 'coursehero.com', 'deutsche-wirtschafts-nachrichten.de', 'die-glocke.de', 'dn.no', 'dn.se', 'elordenmundial.com', 'entrepreneur.com', 'epw.in', 'expresso.pt', 'falter.at', 'finance.si', 'ftchinese.com', 'ftchineselive.com', 'gamestar.de', 'geo.de', 'golem.de', 'gp.se', 'handelsblatt.com', 'hbrchina.org', 'hbrfrance.fr', 'heise.de', 'hln.be', 'hs.fi', 'ilsole24ore.com', 'information.dk', 'investors.com', 'iltalehti.fi', 'jacobin.com', 'jeuneafrique.com', 'jungefreiheit.de', 'kleinezeitung.at', 'lavie.fr', 'lavozdegalicia.es', 'law360.co.uk', 'law360.com', 'le1hebdo.fr', 'leconomiste.com', 'lefilmfrancais.com', 'lequipe.fr', 'lesjours.fr', 'letemps.ch', 'liberation.fr', 'limburger.nl', 'main-echo.de', 'mainpost.de', 'manager-magazin.de', 'medianama.com', 'mediapart.fr', 'milanofinanza.it', 'mittelbayerische.de', 'monde-diplomatique.fr', 'mondediplo.com', 'money.it', 'moneycontrol.com', 'moodys.com', 'morningstar.com', 'moz.de', 'nachrichten.at', 'nationaljournal.com', 'nature.com', 'nbr.co.nz', 'newslaundry.com', 'nn.de', 'nwzonline.de', 'observador.pt', 'ouest-france.fr', 'philonomist.com', 'pnp.de', 'politicopro.com', 'politiken.dk', 'pressreader.com', 'publico.pt', 'quillette.com', 'republic.ru', 'rheinpfalz.de', 'risk.net', 'rnz.de', 'saechsische.de', 'schwarzwaelder-bote.de', 'sciencedirect.com', 'springer.com', 'statnews.com', 'stern.de', 'stimme.de', 'straitstimes.com', 'stratfor.com', 'substack.com', 'suedkurier.de', 'swp.de', 'techcrunch.com', 'the-ken.com', 'theinformation.com', 'theinitium.com', 'themorningcontext.com', 'theparisreview.org', 'thestar.com.my', 'thewirechina.com', 'weltwoche.ch', 'weltwoche.de', 'wissenschaft.de', 'wiwo.de', 'worldpoliticsreview.com', 'ynet.co.il'].concat(be_mediahuis_nofix_domains, de_funke_medien_nofix_domains, de_rp_aachen_medien_nofix_domains, fr_groupe_ebra_nofix_domains, fr_indigo_nofix_domains, il_haaretz_group_nofix_domains, it_gedi_nofix_domains, nl_mediahuis_region_nofix_domains); diff --git a/sites_updated.json b/sites_updated.json index a6ccbfe..6a832ab 100644 --- a/sites_updated.json +++ b/sites_updated.json @@ -44,6 +44,32 @@ "cs_code": "[{\"cond\":\"div.article-gating-wrapper\", \"rm_elem\":1}, {\"cond\":\"div[class*='gated-overlay']\", \"rm_attrib\":\"class\"}]", "upd_version": "3.4.7.8" }, + "Haaretz": { + "domain": "haaretz.co.il", + "allow_cookies": 1, + "add_ext_link": "meta[property='og:url'][content*='/.premium/']|article p", + "add_ext_link_type": "google_search_tool", + "upd_version": "3.4.7.7" + }, + "Haaretz English": { + "domain": "haaretz.com", + "allow_cookies": 1, + "add_ext_link": "meta[property='og:url'][content*='/.premium/']|article p", + "add_ext_link_type": "google_search_tool", + "upd_version": "3.4.7.7" + }, + "Haaretz Group": { + "domain": "###_il_haaretz_group", + "group": [ + "haaretz.co.il", + "haaretz.com", + "themarker.com" + ], + "allow_cookies": 1, + "add_ext_link": "meta[property='og:url'][content*='/.premium/']|article p", + "add_ext_link_type": "google_search_tool", + "upd_version": "3.4.8.2" + }, "Literary Review (UK)": { "domain": "literaryreview.co.uk", "allow_cookies": 1, @@ -109,6 +135,13 @@ "cs_code": "[{\"cond\":\"div.paywall\", \"rm_elem\": 1, \"elems\":[{\"cond\":\"svelte-scroller-outer\", \"rm_elem\": 1}, {\"cond\":\"body > style\", \"rm_elem\": 1}]}]", "upd_version": "3.2.7.6" }, + "The Marker": { + "domain": "themarker.com", + "allow_cookies": 1, + "add_ext_link": "meta[property='og:url'][content*='/.premium/']|article p", + "add_ext_link_type": "google_search_tool", + "upd_version": "3.4.7.7" + }, "The New York Times": { "domain": "nytimes.com", "allow_cookies": 1,