Merge branch 'master' into next-gen

Merge branch 'master' of https://gitlab.com/KevinRoebert/ClearUrls
Exception for api.bilibili.com
2025-12-17 06:35:37 +07:00 · 2020-05-19 17:40:24 +02:00 · 2020-05-19 17:37:37 +02:00 · 2020-05-19 17:37:30 +02:00 · 2020-05-19 15:34:54 +00:00 · 2020-05-19 17:26:30 +02:00
3 changed files with 261 additions and 21 deletions
--- a/README.md
+++ b/README.md
@@ -75,6 +75,7 @@ Please push your translation into the folder `_locales/{country code}/messages.j
 ## Recommended by...
 *  [ghacks-user.js](https://github.com/ghacksuserjs/ghacks-user.js/wiki/4.1-Extensions)
 *  [Awesome Humane Tech List](https://github.com/humanetech-community/awesome-humane-tech#tracking)
+*  [PrivacyTools](https://www.privacytools.io/browsers/#addons)
 *  ClearURLs is part of Mozilla's recommended extensions program

 ## Permissions
--- a/clearurls.js
+++ b/clearurls.js
@@ -32,10 +32,10 @@ var os;
 * for each provider given as parameter.
 *
 * @param  {Provider} provider      Provider-Object
- * @param pureUrl                   URL as String
- * @param {boolean} quiet           if the action should be displayed in log and statistics
- * @param {requestDetails} request  the request details
- * @return {Array}                  Array with changes and url fields
+ * @param  {string}   pureUrl       URL as String
+ * @param  {boolean}  quiet         If the action should be displayed in log and statistics
+ * @param {requestDetails} request  The request details
+ * @return {object}                 Object with changes and url fields
 */
 function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
    let url = pureUrl;
@@ -82,7 +82,7 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {

    /*
    * Expand the url by provider redirections. So no tracking on
-    * url redirections form sites to sites.
+    * url redirections form site to site.
    */
    let re = provider.getRedirection(url);
    if (re !== null) {
@@ -92,8 +92,8 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
        if (!quiet) {
            pushToLog(pureUrl, url, translate('log_redirect'));
            increaseGlobalURLCounter(1);
-            increaseBadged(false, request)
-        };
+            increaseBadged(false, request);
+        }

        return {
            "redirect": true,
--- a/data/data.min.json
+++ b/data/data.min.json
@@ -3,6 +3,62 @@
        "amazon": {
            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(amazon)(\\.[a-zA-Z]{2,}).*",
            "completeProvider": false,
+            "rules": [
+                "pf_rd_[a-zA-Z]",
+                "qid",
+                "sr",
+                "srs",
+                "pd_rd_[a-zA-Z]*",
+                "__mk_[a-zA-Z]{1,3}_[a-zA-Z]{1,3}",
+                "spIA",
+                "ms3_c",
+                "[a-zA-Z%0-9]*ie",
+                "refRID",
+                "colid",
+                "coliid",
+                "[^a-zA-Z%0-9]adId",
+                "qualifier",
+                "_encoding",
+                "smid",
+                "field-lbr_brands_browse-bin",
+                "ref_?",
+                "th",
+                "sprefix",
+                "crid",
+                "keywords",
+                "cv_ct_[a-zA-Z]+",
+                "linkCode",
+                "creativeASIN",
+                "ascsubtag",
+                "aaxitk",
+                "hsa_cr_id",
+                "sb-ci-[a-zA-Z]+",
+                "rnid",
+                "dchild",
+                "camp",
+                "creative",
+                "s"
+            ],
+            "referralMarketing": [
+                "tag"
+            ],
+            "exceptions": [
+                ".*(amazon\\.).*(\\/gp).*\\/redirector.html\\/.*",
+                ".*(amazon\\.).*(\\/hz\\/reviews-render\\/ajax\\/).*",
+                ".*(amazon\\.).*(\\/gp).*\\/cart\\/ajax-update.html\\/.*",
+                ".*(amazon\\.).*\\/message-us\\?.*",
+                ".*(amazon\\.).*(\\/gp).*\\/video\\/api\\/.*",
+                ".*(amazon\\.).*\\/s\\?.*"
+            ],
+            "rawRules": [
+                "\\/ref=[^\\/\\?]*"
+            ],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "amazon search": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(amazon)(\\.[a-zA-Z]{2,}).*\\/s.*\\?.*",
+            "completeProvider": false,
            "rules": [
                "pf_rd_[a-zA-Z]",
                "qid",
@@ -41,16 +97,10 @@
            "referralMarketing": [
                "tag"
            ],
-            "exceptions": [
-                ".*(amazon\\.).*(\\/gp).*\\/redirector.html\\/.*",
-                ".*(amazon\\.).*(\\/hz\\/reviews-render\\/ajax\\/).*",
-                ".*(amazon\\.).*(\\/gp).*\\/cart\\/ajax-update.html\\/.*",
-                ".*(amazon\\.).*\\/message-us\\?.*",
-                ".*(amazon\\.).*(\\/gp).*\\/video\\/api\\/.*"
-            ],
            "rawRules": [
                "\\/ref=[^\\/\\?]*"
            ],
+            "exceptions": [],
            "redirections": [],
            "forceRedirection": false
        },
@@ -182,7 +232,7 @@
            "urlPattern": ".*",
            "completeProvider": false,
            "rules": [
-                "(%3F)?utm(_[a-zA-Z]*)?",
+                "(%3F)?utm(_[a-zA-Z_]*)?",
                "(%3F)?ga_[a-zA-Z_]+",
                "(%3F)?yclid",
                "(%3F)?_openstat",
@@ -212,7 +262,8 @@
                "(%3F)?dclid",
                "Echobox",
                "(%3F)?spm",
-                "(%3F)?vn(_[a-zA-Z]*)+"
+                "(%3F)?vn(_[a-zA-Z]*)+",
+                "(%3F)?cid"
            ],
            "referralMarketing": [],
            "rawRules": [],
@@ -253,7 +304,10 @@
                ".*(login\\.progressive\\.com).*",
                ".*(sephora\\.com\\/api\\/).*",
                ".*(contestgirl\\.com).*",
-                ".*agenciatributaria.gob.es.*"
+                ".*agenciatributaria.gob.es.*",
+                ".*login\\.ingbank\\.pl.*",
+                "wss?:\\/\\/.*zoom\\.us.*",
+                ".*api\\.bilibili\\.com.*"
            ],
            "redirections": [],
            "forceRedirection": false
@@ -1067,7 +1121,9 @@
            "referralMarketing": [],
            "rawRules": [],
            "exceptions": [],
-            "redirections": [],
+            "redirections": [
+                ".*u=([^&]*)"
+            ],
            "forceRedirection": false
        },
        "lazada.com.my": {
@@ -1655,7 +1711,10 @@
                "mots",
                "noredirect",
                "RewriteLast",
-                "lien"
+                "lien",
+                "aComposeInputSearch",
+                "type_recherche_forum",
+                "add_mots"
            ],
            "referralMarketing": [],
            "rawRules": [],
@@ -1672,7 +1731,9 @@
                "type_recherche",
                "noredirect",
                "RewriteLast",
-                "lien"
+                "lien",
+                "aComposeInputSearch",
+                "type_recherche_forum"
            ],
            "referralMarketing": [],
            "rawRules": [],
@@ -1708,6 +1769,184 @@
                ".*url=([^&]*)"
            ],
            "forceRedirection": false
+        },
+        "tiktok.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(tiktok)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "u_code",
+                "preview_pb",
+                "language",
+                "_d",
+                "timestamp",
+                "user_id",
+                "share_app_name",
+                "share_iid",
+                "source"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "autoplus.fr": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(autoplus)(\\.fr).*",
+            "completeProvider": false,
+            "rules": [
+                "idprob",
+                "hash",
+                "sending_id",
+                "site_id",
+                "dr_tracker"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "bigfishgames.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(bigfishgames)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "pc",
+                "npc",
+                "npv[0-9]+",
+                "npi"
+            ],
+            "referralMarketing": [],
+            "rawRules": [
+                "\\?pc$"
+            ],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "dpbolvw.net": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(dpbolvw)(\\.net).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*url=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "humblebundle.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(humblebundle)(\\.com).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [
+                "partner"
+            ],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "cafepedagogique.net": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(cafepedagogique)(\\.net).*",
+            "completeProvider": false,
+            "rules": [
+                "actId",
+                "actCampaignType",
+                "actSource"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "bloculus.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(bloculus)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "tl_[a-zA-Z_]+"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "mailpanion.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(mailpanion)(\\.com).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*destination=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "signtr.website": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(signtr)(\\.website).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*redirect=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "mailtrack.io": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(mailtrack)(\\.io).*",
+            "completeProvider": false,
+            "rules": [],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [
+                ".*url=([^&]*)"
+            ],
+            "forceRedirection": false
+        },
+        "zillow.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(zillow)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "rtoken"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "realtor.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(realtor)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "ex",
+                "identityID",
+                "MID",
+                "RID"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
+        },
+        "redfin.com": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-.]*\\.)?(redfin)(\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "riftinfo"
+            ],
+            "referralMarketing": [],
+            "rawRules": [],
+            "exceptions": [],
+            "redirections": [],
+            "forceRedirection": false
        }
    }
 }
Author	SHA1	Message	Date
Kevin Röbert	d58756f716	Merge branch 'master' into next-gen	2020-05-19 17:40:24 +02:00
Kevin Röbert	3ade08f344	Merge branch 'master' of https://gitlab.com/KevinRoebert/ClearUrls	2020-05-19 17:37:37 +02:00
Kevin Röbert	ea256a8081	Exception for api.bilibili.com	2020-05-19 17:37:30 +02:00
Kevin	90ab42a510	Merge branch 'add-privacytools-recommendation' into 'master' Add PrivacyTools recommendation See merge request KevinRoebert/ClearUrls!60	2020-05-19 15:34:54 +00:00
Kevin Röbert	c60e33d327	Added exception for zoom.us websocket #513	2020-05-19 17:26:30 +02:00
Luca Trevisani	9f47a35318	Add PrivacyTools recommendation	2020-05-16 17:25:40 +00:00
Kevin Röbert	e931674dfe	Added rules & exceptions #501 #499 #493 #492 #491 #487 #486 #485 #484 #482 #479 #477 #473	2020-05-15 15:54:14 +02:00
Kevin	ed87f72c75	Merge branch 'patch-1' into 'master' added some fields for marketscreener.com... Closes #448 See merge request KevinRoebert/ClearUrls!59	2020-05-15 12:03:31 +00:00
DJCrashdummy	ee2e544223	added some fields for marketscreener.com (https://gitlab.com/KevinRoebert/ClearUrls/-/issues/448#note_343173596 )	2020-05-15 09:48:40 +00:00
Kevin Röbert	368e96edf1	Merge branch 'master' into next-gen	2020-04-28 02:16:05 +02:00
Kevin Röbert	ec4baefaa1	Merge branch 'master' into next-gen	2020-04-15 01:28:46 +02:00
Kevin Röbert	f46af5615c	Merge branch 'master' into next-gen	2020-03-23 23:23:18 +01:00
Kevin Röbert	b602b0431a	Merge branch 'master' into next-gen	2020-03-20 20:18:37 +01:00
Kevin Röbert	fa1c3b35ac	Merge branch 'master' into next-gen	2020-02-27 17:58:21 +01:00
Kevin R	49717332a9	Refactoring	2020-02-27 17:12:47 +01:00
Kevin R	2d9e7c63bb	Merge branch 'master' into next-gen	2020-02-27 16:55:46 +01:00
Kevin R	5096150723	Merge branch 'master' into next-gen	2020-02-27 16:06:41 +01:00