From 60dae5eda08503bb5da4b00f475f5cad41034454 Mon Sep 17 00:00:00 2001 From: Andrey Yakushin Date: Tue, 15 Apr 2025 13:56:26 +0400 Subject: [PATCH 1/8] Improve description of partiness modifiers --- .../general/ad-filtering/create-own-filters.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index 0faa4b74f26..11cc2d6252b 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -742,6 +742,8 @@ Rules with the `$popup` modifier are not supported by AdGuard Content Blocker. Works the same as the [`$~third-party`](#third-party-modifier) modifier, but only treats the request as first-party if the referrer and origin have exactly the same hostname. +Requests without referrer are also treated as first-party requests and the rules with `$strict-first-party` modifier will be applied to such requests. + **Examples** - domain.com$strict-first-party' — this rule applies only to `domain.com`. For example, a request from `domain.com` to `http://domain.com/icon.ico` is a first-party request. A request from `sub.domain.com` to `http://domain.com/icon.ico` is treated as a third-party one (as opposed to the `$~third-party` modifier). @@ -756,6 +758,8 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs] v1.16 or later. +Requests without referrer are matched by rules with `$strict-first-party` in Adguard for Windows, AdGuard for Mac and AdGuard for Android with [CoreLibs] v1.18 or later. + ::: #### **`$strict-third-party`** {#strict-third-party-modifier} @@ -795,13 +799,15 @@ To be considered as such, a third-party request should meet one of the following **`$third-party`:** -- `||domain.com^$third-party` — this rule applies to all domains, except `domain.com` and its subdomains. An example of a third-party request: `http://example.org/banner.jpg`. +- `||domain.com^$third-party` — this rule applies to all domains, except `domain.com` and its subdomains. The rule will never be applied if there is not referrer. An example of a third-party request: `http://example.org/banner.jpg`. -If there is a `$~third-party` modifier, the rule is only applied to the requests that are not from third parties. Which means, they have to be sent from the same domain. +If there is a `$~third-party` modifier, the rule is only applied to the requests that are not from third parties. Which means, they have to be sent from the same domain or shouldn't have referrer at all. **`$~third-party`:** -- `||domain.com$~third-party` — this rule is applied exclusively to `domain.com`. Example of a non third-party request: `http://domain.com/icon.ico`. +- `||domain.com$~third-party` — this rule is applied exclusively to `domain.com` and its subdomains. Example of a non third-party request: `http://sub.domain.com/icon.ico`. + +Requests without referrer are also treated as non-third-party requests and the rules with `$~third-party` modifier will be applied to such requests. :::note @@ -809,6 +815,12 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p ::: +:::info Compatibility + +Requests without referrer are matched by rules with `$~third-party` in Adguard for Windows, AdGuard for Mac and AdGuard for Android with [CoreLibs] v1.18 or later. + +::: + #### **`$to`** {#to-modifier} `$to` limits the rule scope to requests made **to** the specified domains and their subdomains. To add multiple domains to one rule, use the `|` character as a separator. From 2717ddd2f7639f5f2648bc5b8aae436f87bb18e4 Mon Sep 17 00:00:00 2001 From: Helen <58733007+el-termikael@users.noreply.github.com> Date: Mon, 12 May 2025 13:38:54 +0300 Subject: [PATCH 2/8] Update docs/general/ad-filtering/create-own-filters.md --- docs/general/ad-filtering/create-own-filters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index 11cc2d6252b..e474db256fd 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -742,7 +742,7 @@ Rules with the `$popup` modifier are not supported by AdGuard Content Blocker. Works the same as the [`$~third-party`](#third-party-modifier) modifier, but only treats the request as first-party if the referrer and origin have exactly the same hostname. -Requests without referrer are also treated as first-party requests and the rules with `$strict-first-party` modifier will be applied to such requests. +Requests without a referrer are also treated as first-party requests, and the rules with the `$strict-first-party` modifier are applied to such requests. **Examples** From 7933952c9082e72ec782fb0636eb65524926a197 Mon Sep 17 00:00:00 2001 From: Helen <58733007+el-termikael@users.noreply.github.com> Date: Mon, 12 May 2025 13:39:01 +0300 Subject: [PATCH 3/8] Update docs/general/ad-filtering/create-own-filters.md --- docs/general/ad-filtering/create-own-filters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index e474db256fd..aebdfc821ca 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -758,7 +758,7 @@ You can use a shorter name (alias) instead of using the full modifier name: `$st Rules with the `$strict-first-party` modifier are supported by AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs] v1.16 or later. -Requests without referrer are matched by rules with `$strict-first-party` in Adguard for Windows, AdGuard for Mac and AdGuard for Android with [CoreLibs] v1.18 or later. +Requests without a referrer are matched by rules with `$strict-first-party` in AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs] v1.18 or later. ::: From 7e79b5511cc7dd7abf70e4a9b79937373e4f28a8 Mon Sep 17 00:00:00 2001 From: Helen <58733007+el-termikael@users.noreply.github.com> Date: Mon, 12 May 2025 13:39:09 +0300 Subject: [PATCH 4/8] Update docs/general/ad-filtering/create-own-filters.md --- docs/general/ad-filtering/create-own-filters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index aebdfc821ca..ae7c7636057 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -799,7 +799,7 @@ To be considered as such, a third-party request should meet one of the following **`$third-party`:** -- `||domain.com^$third-party` — this rule applies to all domains, except `domain.com` and its subdomains. The rule will never be applied if there is not referrer. An example of a third-party request: `http://example.org/banner.jpg`. +- `||domain.com^$third-party` — this rule applies to all domains except `domain.com` and its subdomains. The rule is never applied if there is no referrer. An example of a third-party request: `http://example.org/banner.jpg`. If there is a `$~third-party` modifier, the rule is only applied to the requests that are not from third parties. Which means, they have to be sent from the same domain or shouldn't have referrer at all. From cf7fe3dbebc3226fd09ea2aeeda6cd37c2cdcfa9 Mon Sep 17 00:00:00 2001 From: Helen <58733007+el-termikael@users.noreply.github.com> Date: Mon, 12 May 2025 13:39:27 +0300 Subject: [PATCH 5/8] Update docs/general/ad-filtering/create-own-filters.md --- docs/general/ad-filtering/create-own-filters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index ae7c7636057..ec45f4395d0 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -801,7 +801,7 @@ To be considered as such, a third-party request should meet one of the following - `||domain.com^$third-party` — this rule applies to all domains except `domain.com` and its subdomains. The rule is never applied if there is no referrer. An example of a third-party request: `http://example.org/banner.jpg`. -If there is a `$~third-party` modifier, the rule is only applied to the requests that are not from third parties. Which means, they have to be sent from the same domain or shouldn't have referrer at all. +If there is a `$~third-party` modifier, the rule is only applied to requests that are not from third parties. Which means they have to be sent from the same domain or shouldn't have a referrer at all. **`$~third-party`:** From c18164e98dd1f2d323ef218218c177445d0ab9c4 Mon Sep 17 00:00:00 2001 From: Helen <58733007+el-termikael@users.noreply.github.com> Date: Mon, 12 May 2025 13:39:34 +0300 Subject: [PATCH 6/8] Update docs/general/ad-filtering/create-own-filters.md --- docs/general/ad-filtering/create-own-filters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index ec45f4395d0..3c92d5c2afa 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -805,7 +805,7 @@ If there is a `$~third-party` modifier, the rule is only applied to requests tha **`$~third-party`:** -- `||domain.com$~third-party` — this rule is applied exclusively to `domain.com` and its subdomains. Example of a non third-party request: `http://sub.domain.com/icon.ico`. +- `||domain.com$~third-party` — this rule applies only to `domain.com` and its subdomains. Example of a non third-party request: `http://sub.domain.com/icon.ico`. Requests without referrer are also treated as non-third-party requests and the rules with `$~third-party` modifier will be applied to such requests. From 63b47b7cf1ba41a0e9d3f1a865ac0454b8518a17 Mon Sep 17 00:00:00 2001 From: Helen <58733007+el-termikael@users.noreply.github.com> Date: Mon, 12 May 2025 13:39:40 +0300 Subject: [PATCH 7/8] Update docs/general/ad-filtering/create-own-filters.md --- docs/general/ad-filtering/create-own-filters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index 3c92d5c2afa..d3aaf7ccc13 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -807,7 +807,7 @@ If there is a `$~third-party` modifier, the rule is only applied to requests tha - `||domain.com$~third-party` — this rule applies only to `domain.com` and its subdomains. Example of a non third-party request: `http://sub.domain.com/icon.ico`. -Requests without referrer are also treated as non-third-party requests and the rules with `$~third-party` modifier will be applied to such requests. +Requests without a referrer are also treated as non third-party requests and the rules with the `$~third-party` modifier are applied to such requests. :::note From 661b3913bf9e83125cf69a94d9898d736890d8cf Mon Sep 17 00:00:00 2001 From: Helen <58733007+el-termikael@users.noreply.github.com> Date: Mon, 12 May 2025 13:40:21 +0300 Subject: [PATCH 8/8] Update docs/general/ad-filtering/create-own-filters.md --- docs/general/ad-filtering/create-own-filters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index d3aaf7ccc13..2dc74ac1d06 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -817,7 +817,7 @@ You may use a shorter name (alias) instead of using the full modifier name: `$3p :::info Compatibility -Requests without referrer are matched by rules with `$~third-party` in Adguard for Windows, AdGuard for Mac and AdGuard for Android with [CoreLibs] v1.18 or later. +Requests without a referrer are matched by rules with `$~third-party` in AdGuard for Windows, AdGuard for Mac, and AdGuard for Android with [CoreLibs] v1.18 or later. :::