diff options
author | 2023-04-05 02:12:51 +0300 | |
---|---|---|
committer | 2023-04-05 02:12:51 +0300 | |
commit | 7415131908c76d4398ac73294fdddb522e10fa9b (patch) | |
tree | a44debe4e612a85e1e31605728dffad6dc06b199 | |
parent | Handle infracted user not being on the server (diff) |
`domain/subdomains` -> `domain/only_subdomains` for clarity
Also changes the alert to use the full domain instead of the filter content.
-rw-r--r-- | bot/exts/filtering/_filters/domain.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bot/exts/filtering/_filters/domain.py b/bot/exts/filtering/_filters/domain.py index 7c229fdcb..ac9cc9018 100644 --- a/bot/exts/filtering/_filters/domain.py +++ b/bot/exts/filtering/_filters/domain.py @@ -1,5 +1,5 @@ import re -from typing import ClassVar, Optional +from typing import ClassVar from urllib.parse import urlparse import tldextract @@ -15,12 +15,12 @@ URL_RE = re.compile(r"(?:https?://)?(\S+?)[\\/]*", flags=re.IGNORECASE) class ExtraDomainSettings(BaseModel): """Extra settings for how domains should be matched in a message.""" - subdomains_description: ClassVar[str] = ( - "A boolean. If True, will will only trigger for subdomains and subpaths, and not for the domain itself." + only_subdomains_description: ClassVar[str] = ( + "A boolean. If True, will only trigger for subdomains and subpaths, and not for the domain itself." ) # Whether to trigger only for subdomains and subpaths, and not the specified domain itself. - subdomains: Optional[bool] = False + only_subdomains: bool = False class DomainFilter(Filter): @@ -41,10 +41,10 @@ class DomainFilter(Filter): for found_url in ctx.content: extract = tldextract.extract(found_url) if self.content in found_url and extract.registered_domain == domain: - if self.extra_fields.subdomains: + if self.extra_fields.only_subdomains: if not extract.subdomain and not urlparse(f"https://{found_url}").path: return False - ctx.matches.append(self.content) + ctx.matches.append(found_url) ctx.notification_domain = self.content return True return False |