From 70a2a048b83b55c174a7222dead51b5d2139bd4e Mon Sep 17 00:00:00 2001 From: Stanislav A Date: Tue, 1 Aug 2023 18:57:12 +0300 Subject: [PATCH 1/4] update cosmetic url modifier compatibility --- docs/general/ad-filtering/create-own-filters.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index af596908c1f..581efde3de5 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -3365,7 +3365,7 @@ Rules with `$path` modifier are supported by AdGuard for Windows, Mac, and Andro ::: -#### **`url`** {#non-basic-url-modifier} +#### **`$url`** {#non-basic-url-modifier} `$url` modifier limits the rule application area to URLs matching the specified mask. @@ -3386,7 +3386,7 @@ The [special characters](#basic-rules-special-characters) and [regular expressio :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, Mac, and Android, **running CoreLibs version 1.11 or later**. +Rules with the `$url` modifier are supported by AdGuard for Windows, Mac, and Android, **running CoreLibs version 1.11 or later**, and AdGuard Browser Extension, **running TSUrlFilter vX.X.X or later**. ::: From d802d067f1ae5f260794575c6aacb9f98828e34c Mon Sep 17 00:00:00 2001 From: Stanislav A Date: Wed, 2 Aug 2023 19:44:34 +0300 Subject: [PATCH 2/4] add compatibility info --- docs/general/ad-filtering/create-own-filters.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index 581efde3de5..98f6f3af203 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -3386,7 +3386,8 @@ The [special characters](#basic-rules-special-characters) and [regular expressio :::info Compatibility -Rules with the `$url` modifier are supported by AdGuard for Windows, Mac, and Android, **running CoreLibs version 1.11 or later**, and AdGuard Browser Extension, **running TSUrlFilter vX.X.X or later**. +* Rules with the `$url` modifier are supported by AdGuard for Windows, Mac, and Android, **running CoreLibs version 1.11 or later**, and AdGuard Browser Extension, **running TSUrlFilter vX.X.X or later**. +* `url` modifiers is not compatible with `$domain` and `$path` modifiers and domain-specific rules. For example, the rule `[$url=/category/*]example.com###textad` will be rejected. ::: From 13dae9a8d9e96f615565b2d20054835505fea24e Mon Sep 17 00:00:00 2001 From: Slava Leleka Date: Thu, 8 Aug 2024 16:55:42 +0300 Subject: [PATCH 3/4] fix non-basic url modifier description --- .../general/ad-filtering/create-own-filters.md | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index f79bc08c200..b8c1239bd02 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -4016,12 +4016,12 @@ this: `\]`. | [$app](#non-basic-app-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | | [$domain](#non-basic-domain-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | | [$path](#non-basic-path-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | -| [$url](#non-basic-url-modifier) | ✅ | ⏳ | ⏳ | ❌ | ❌ | ❌ | +| [$url](#non-basic-url-modifier) | ✅ | 🧩 [*](#non-basic-url-modifier-limitations) | 🧩 [*](#non-basic-url-modifier-limitations) | ❌ | ❌ | ❌ | :::note - ✅ — fully supported -- ⏳ — feature that has been implemented or is planned to be implemented but is not yet available in any product +- 🧩 — may already be implemented in nightly or beta versions but is not yet supported in release versions - ❌ — not supported ::: @@ -4123,10 +4123,20 @@ The [special characters](#basic-rules-special-characters) and [regular expressio - `[$url=||example.org^]###adblock` hides an element with attribute `id` equal to `adblock` at `example.org` and its subdomains. - `[$url=/\[a-z\]+\\.example\\.com^/]##.textad` hides `div` elements of the class `textad` for all domains matching the regular expression `[a-z]+\.example\.com^`. +#### `$url` modifier limitations {#non-basic-url-modifier-limitations} + +:::caution Restrictions + +In AdGuard Browser Extension, non-basic `$url` modifiers is not compatible with domain-specific rules +and other non-basic modifiers — [`$domain`](#non-basic-domain-modifier) and [`$path`](#non-basic-path-modifier). +For example, the rule `[$url=/category/*]example.com###textad` will not be applied. + +::: + :::info Compatibility -- Rules with the `$url` modifier are supported by AdGuard for Windows, Mac, and Android with [CoreLibs] v1.11 or later, and AdGuard Browser Extension with [TSUrlFilter] v3.0 or later. -- Non-basic `$url` modifiers is not compatible with domain-specific rules and other non-basic modifiers — [`$domain`](#non-basic-domain-modifier) and [`$path`](#non-basic-path-modifier). For example, the rule `[$url=/category/*]example.com###textad` will be rejected. +Rules with the `$url` modifier are supported by AdGuard for Windows, Mac, and Android with [CoreLibs] v1.11 or later, +and AdGuard Browser Extension with [TSUrlFilter] v3.0.0 or later. ::: From 51a3452f5e09a0080c7f6259226bd03199baaf47 Mon Sep 17 00:00:00 2001 From: Slava Leleka Date: Fri, 9 Aug 2024 01:31:59 +0300 Subject: [PATCH 4/4] fix typo --- 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 b8c1239bd02..4260eee82e9 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -4127,7 +4127,7 @@ The [special characters](#basic-rules-special-characters) and [regular expressio :::caution Restrictions -In AdGuard Browser Extension, non-basic `$url` modifiers is not compatible with domain-specific rules +In AdGuard Browser Extension, non-basic `$url` modifier is not compatible with domain-specific rules and other non-basic modifiers — [`$domain`](#non-basic-domain-modifier) and [`$path`](#non-basic-path-modifier). For example, the rule `[$url=/category/*]example.com###textad` will not be applied.