From 6da3f431d4d7c1155bca80e6b546001a039282ad Mon Sep 17 00:00:00 2001 From: magnolia1234 <7676006-magnolia1234@users.noreply.gitlab.com> Date: Fri, 20 Nov 2020 19:08:11 +0100 Subject: [PATCH] Release v1.9.6.0 --- LICENSE | 2 +- README.md | 22 +++++++++++----------- background.js | 25 ++----------------------- changelog.txt | 3 +++ contentScript.js | 2 +- manifest.json | 8 ++++---- options.html | 2 +- popup.html | 4 ++-- updates.xml | 2 +- version.js | 9 +++++---- 10 files changed, 31 insertions(+), 48 deletions(-) diff --git a/LICENSE b/LICENSE index 15bc72f..ab20918 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 +Copyright (c) 2020, magnolia1234 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 82c57e1..1258995 100755 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The following instructions are needed to install third-party extensions in [Chro In extension developer mode you can always install BPC by `Load unpacked` (no automatic updates) or by crx-file (automatic updates, but possible 'whitelisting' of extension is needed). #### Load unpacked: Chrome (Windows, MacOS, Linux), Microsoft Edge (Chromium)/Brave/Yandex (or 'whitelist' extension and install automatically updating crx-file (see next section)) -1. Download this repository as a [ZIP-file from BitBucket](https://bitbucket.org/magnolia1234/bypass-paywalls-chrome-clean/get/master.zip). +1. Download this repository as a [ZIP-file from GitLab](https://gitlab.com/magnolia1234/bypass-paywalls-chrome-clean/-/archive/master/bypass-paywalls-chrome-clean-master.zip). 2. Unzip the file and you should have a folder named `magnolia1234-bypass-paywalls-chrome-clean-(commit-hash)`. 3. Move the folder to a permanent location on your computer (do not delete the folder after installation). 4. Go to the extensions page (`chrome://extensions` or `edge://extensions`). @@ -28,14 +28,14 @@ In extension developer mode you can always install BPC by `Load unpacked` (no au If you're familiar with Git(Hub)-clients you can also clone this repo and update the extension that way (load unpacked folder used by Git(Hub)-client). #### CRX-file: other Chromium browsers (Opera/Vivaldi) (or add extension to 'whitelist' for Chrome, MS Edge, Brave or Yandex (see instructions below for Windows)) -1. Download the extension as a crx-file from the [download page](https://bitbucket.org/magnolia1234/bypass-paywalls-chrome-clean/downloads). +1. Download the extension as a crx-file from the [releases page](https://gitlab.com/magnolia1234/bypass-paywalls-chrome-clean/-/releases). 2. In your browser go to the extensions page. 3. Enable Developer Mode. 4. Drag your crx-file anywhere on the page to import it. 5. If dragging crx-file does not work, try Chrome procedure (above). * by default BPC has limited permissions, but you can opt-in to enable custom sites (and also clear cookies/block general paywall-scripts for non-listed sites). -* In Windows 'whitelist' BPC (run as administrator one of the reg-files in [whitelist-downloads](https://bitbucket.org/magnolia1234/bypass-paywalls-chrome-clean-whitelist/downloads) +* In Windows 'whitelist' BPC (run as administrator one of the reg-files in [whitelist-downloads](https://gitlab.com/magnolia1234/bypass-paywalls-chrome-clean/-/tree/master/whitelist) If you already have 'whitelisted' extensions than you should change "1" to a new key (also change name of HLM-key for beta/developer versions of browsers). Example Chrome-regfile: Windows Registry Editor Version 5.00 @@ -48,7 +48,7 @@ Windows Registry Editor Version 5.00 3. For Yandex Browser follow Chrome instructions above (load unpacked; step 6: pick `manifest.json` instead of the folder). #### Firefox -Visit the [Firefox repository](https://bitbucket.org/magnolia1234/bypass-paywalls-firefox-clean) of Bypass Paywall Clean. +Visit the [Firefox repository](https://gitlab.com/magnolia1234/bypass-paywalls-firefox-clean) of Bypass Paywall Clean. #### Notes * This extension works best alongside the adblocker [uBlock Origin](https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm?hl=en). @@ -407,9 +407,9 @@ For user with the limited permissions BPC-version this will only work for suppor If removing the cookies works you can also add the site as a custom site. ### New site requests -You can submit a request for a new website [here](https://bitbucket.org/magnolia1234/bypass-paywalls-chrome-clean/issues?status=new&status=open). +You can submit a request for a new website [here](https://gitlab.com/magnolia1234/bypass-paywalls-chrome-clean/-/issues). Please read the following instructions and share your results for a quicker process. -Remember to check the [previous requests](https://bitbucket.org/magnolia1234/bypass-paywalls-chrome-clean/issues) before asking for a new website. +Remember to check the [previous requests](https://gitlab.com/magnolia1234/bypass-paywalls-chrome-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+N) and paste the article title into Google. 3. Click on the same article from the Google search results page. Or you can: @@ -429,12 +429,12 @@ Also you can enable Googlebot user-agent or disable Javascript for (sub)domain(s * If a site doesn't work, try turning off uBlock and refreshing. * Make sure the (new) site is checked under Options. * Make sure you're running the last version of Bypass Paywalls Clean. -* If none of these work, you can submit an issue [here](https://bitbucket.org/magnolia1234/bypass-paywalls-chrome-clean/issues). +* If none of these work, you can submit an issue [here](https://gitlab.com/magnolia1234/bypass-paywalls-chrome-clean/-/issues). ### Changelog-releases -* Visit the [changelog page](https://bitbucket.org/magnolia1234/bypass-paywalls-chrome-clean/src/master/changelog.txt). -* Or check the [commits](https://bitbucket.org/magnolia1234/bypass-paywalls-chrome-clean/commits). -* [Download the latest version](https://bitbucket.org/magnolia1234/bypass-paywalls-chrome-clean/downloads) +* Visit the [changelog page](https://gitlab.com/magnolia1234/bypass-paywalls-chrome-clean/-/blob/master/changelog.txt). +* Or check the [commits](https://gitlab.com/magnolia1234/bypass-paywalls-chrome-clean/-/commits/master/). +* [Download the latest version](https://gitlab.com/magnolia1234/bypass-paywalls-chrome-clean/-/releases) ### License -* Bypass Paywalls Clean is [MIT-licensed](https://bitbucket.org/magnolia1234/bypass-paywalls-chrome-clean/src/master/LICENSE). +* Bypass Paywalls Clean is [MIT-licensed](https://gitlab.com/magnolia1234/bypass-paywalls-chrome-clean/-/blob/master/LICENSE). diff --git a/background.js b/background.js index 640332d..cf3c07f 100755 --- a/background.js +++ b/background.js @@ -308,29 +308,6 @@ function setDefaultOptions() { }); } -// copy storage.sync to storage.local (quota exceeded) -ext_api.storage.sync.get({ - sites: {}, - sites_custom: {}, - daily_users: {}, - optIn: {}, - optInShown: {}, - customShown: {} -}, function (items) { - if (Object.keys(items.sites).length > 0) { - ext_api.storage.local.set({ - sites: items.sites, - sites_custom: items.sites_custom, - daily_users: items.daily_users, - optIn: items.optIn, - optInShown: items.optInShown, - customShown: items.customShown - }, function () { - ext_api.storage.sync.remove(['sites', 'sites_custom']); - }); - } -}); - // add grouped sites to en/disabledSites & init rules (optional) function add_grouped_sites(init_rules) { if (enabledSites.includes('ad.nl')) @@ -621,6 +598,7 @@ if (ext_api.webRequest.OnBeforeSendHeadersOptions.hasOwnProperty('EXTRA_HEADERS' extraInfoSpec.push('extraHeaders'); ext_api.webRequest.onBeforeSendHeaders.addListener(function(details) { +/** if (details.type === 'main_frame') { let current_date_str = currentDateStr(); if (last_date_str < current_date_str) { @@ -628,6 +606,7 @@ ext_api.webRequest.onBeforeSendHeaders.addListener(function(details) { last_date_str = current_date_str; } } +**/ var requestHeaders = details.requestHeaders; diff --git a/changelog.txt b/changelog.txt index 4c44742..8674086 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,10 +2,13 @@ Changelog Bypass Paywalls Clean - Chrome Post-release + +* v1.9.6.0 (2020-11-20) Add Helsingin Sanomat (hs.fi, not paivanlehti) Fix-update La Tercera (Chile) Fix-update LesEchos.fr (timing/banners) Fix-update Newsweek (Pelcro) +GitLab transfer * v1.9.5.0 (2020-11-15) Add AlternativesEconomiques.fr diff --git a/contentScript.js b/contentScript.js index e7f6297..092deed 100755 --- a/contentScript.js +++ b/contentScript.js @@ -816,7 +816,7 @@ else if (matchDomain('faz.net')) { str = str.replace(/(?:^|[\w\"\“])(\.|\?|!)(?=[A-ZÖÜ\„][A-Za-zÀ-ÿ\„]{1,})/gm, "$&\n\n"); str = str.replace(/([a-z\"\“])(?=[A-Z](?=[A-Za-zÀ-ÿ]+))/gm, "$&\n\n"); // exceptions: names with alternating lower/uppercase (no general fix) - let str_rep_arr = ["BaFin", "BerlHG", "BfArM", "BilMoG", "EuGH", "GlaxoSmithKline", "IfSG", "iMessage", "iOS", "iPad", "iPhone", "medRxiv", "mRNA", "StVO"]; + let str_rep_arr = ["BaFin", "BerlHG", "BfArM", "BilMoG", "DiGA", "EuGH", "GlaxoSmithKline", "IfSG", "iMessage", "iOS", "iPad", "iPhone", "medRxiv", "mRNA", "PlosOne", "StVO"]; let str_rep_split, str_rep_src; for (let str_rep of str_rep_arr) { str_rep_split = str_rep.split(/([a-z]+)(?=[A-Z](?=[A-Za-z]+))/); diff --git a/manifest.json b/manifest.json index c51e72d..ea9f850 100644 --- a/manifest.json +++ b/manifest.json @@ -1,20 +1,20 @@ { "background": { - "scripts": ["sites.js", "bpc_count_daily_users.js", "background.js"] + "scripts": ["sites.js", "background.js"] }, "content_security_policy": "script-src 'self'; object-src 'self'", "browser_action": { "default_popup": "popup.html" }, "description": "Bypass Paywalls of news sites", - "homepage_url": "https://bitbucket.org/magnolia1234/bypass-paywalls-chrome-clean/src/master/README.md", + "homepage_url": "https://gitlab.com/magnolia1234/bypass-paywalls-chrome-clean/-/blob/master/README.md", "icons": { "128": "bypass.png" }, "manifest_version": 2, "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvLxf4oOeSoz8qKVzKGQWW5zW44hWCoOoQRGXTrObUpyoGfGzhFO8aZHQmBcLrAZMA4O6EA7GaXnHkOPCLKM11seZ4J2azb1gSswApfAlaoeOLnhDnp/Jpzz7Bt6o4HL+nhKRJUOZ9z+GXAyOkOps5O38TwJN5R6z8tLkleRgfYscp19YU/vq1x9PrbXIHJTRB7qtb/iJmiKATKisXGmFY3Nbs5m379TGqcJFBM9bI+8bSJtS4e7t0LHOwSLDq3IVRaWVsFd9P19WEDNTxuzr9+rczOrw1vgmiisNOcElse8cyVIoq4bjepvfHM/9nzDgKwQsNG5OTzujwHu2UUN4cwIDAQAB", "name": "Bypass Paywalls Clean", - "update_url": "https://bitbucket.org/magnolia1234/bypass-paywalls-chrome-clean/raw/master/updates.xml", + "update_url": "https://gitlab.com/magnolia1234/bypass-paywalls-chrome-clean/-/raw/master/updates.xml", "short_name": "Bypass Paywall", "options_ui": { "chrome_style": true, @@ -335,5 +335,5 @@ "webRequest", "webRequestBlocking" ], - "version": "1.9.5.3" + "version": "1.9.6.0" } \ No newline at end of file diff --git a/options.html b/options.html index 709532a..3d14b06 100644 --- a/options.html +++ b/options.html @@ -18,7 +18,7 @@

Options |

-
Changelog +
Changelog
Selected sites will have their cookies cleared and referer set to Google. You should uncheck sites you have an account with or else you will be logged out at every visit.
diff --git a/popup.html b/popup.html index 66a6c37..1fe4d45 100644 --- a/popup.html +++ b/popup.html @@ -19,8 +19,8 @@
Bypass Paywalls Clean   
Options | Custom | -BitBucket
-
Changelog | +GitLab
+
Changelog |
diff --git a/updates.xml b/updates.xml index 3e66d4a..efca9ef 100644 --- a/updates.xml +++ b/updates.xml @@ -1,6 +1,6 @@ - + diff --git a/version.js b/version.js index 8f191cf..eb55f56 100644 --- a/version.js +++ b/version.js @@ -4,8 +4,9 @@ var manifestData = ext_api.runtime.getManifest(); var versionString = 'v' + manifestData.version; document.getElementById('version').innerText = versionString; -const manifest_new = 'https://bitbucket.org/magnolia1234/bypass-paywalls-chrome-clean/raw/master/manifest.json'; -fetch(manifest_new) +const proxyurl = "https://cors-anywhere.herokuapp.com/"; +const manifest_new = 'https://gitlab.com/magnolia1234/bypass-paywalls-chrome-clean/-/raw/master/manifest.json'; +fetch(proxyurl + manifest_new) .then(response => { if (response.ok) { response.json().then(json => { @@ -19,13 +20,13 @@ fetch(manifest_new) versionString_new.appendChild(document.createTextNode('* ')); var anchorEl = document.createElement('a'); anchorEl.text = 'New release v' + version_new; - anchorEl.href = 'https://bitbucket.org/magnolia1234/bypass-paywalls-chrome-clean/downloads'; + anchorEl.href = 'https://gitlab.com/magnolia1234/bypass-paywalls-chrome-clean/-/releases'; anchorEl.target = '_blank'; versionString_new.appendChild(anchorEl); versionString_new.appendChild(document.createTextNode(' *')); if (!manifestData.name.includes('Clean')) { let par = document.createElement('p'); - par.innerHTML = "You've installed a fake version of BPC (check BitBucket)"; + par.innerHTML = "You've installed a fake version of BPC (check GitLab)"; versionString_new.appendChild(par); } }