python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2025-12-09 09:22:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add multiple text filter

Browse source
This commit is contained in:
birdi 2019-07-27 12:20:08 +03:00
parent 07ff9d77d6
commit 1a9a11f3fd
1 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

35
aiogram/dispatcher/filters/builtin.py
View file

@ -206,10 +206,10 @@ class Text(Filter):
""" """
def __init__(self, def __init__(self,
equals: Optional[Union[str, LazyProxy]] = None, equals: Optional[Union[str, LazyProxy, Iterable[Union[str, LazyProxy]]]] = None,
contains: Optional[Union[str, LazyProxy]] = None, contains: Optional[Union[str, LazyProxy, Iterable[Union[str, LazyProxy]]]] = None,
startswith: Optional[Union[str, LazyProxy]] = None, startswith: Optional[Union[str, LazyProxy, Iterable[Union[str, LazyProxy]]]] = None,
endswith: Optional[Union[str, LazyProxy]] = None, endswith: Optional[Union[str, LazyProxy, Iterable[Union[str, LazyProxy]]]] = None,
ignore_case=False): ignore_case=False):
""" """
Check text for one of pattern. Only one mode can be used in one filter. Check text for one of pattern. Only one mode can be used in one filter.
@ -232,6 +232,9 @@ class Text(Filter):
elif check == 0: elif check == 0:
raise ValueError(f"No one mode is specified!") raise ValueError(f"No one mode is specified!")
equals, contains, endswith, startswith = map(lambda e: [e] if isinstance(e, str) or isinstance(e, LazyProxy)
else e,
(equals, contains, endswith, startswith))
self.equals = equals self.equals = equals
self.contains = contains self.contains = contains
self.endswith = endswith self.endswith = endswith
@ -267,25 +270,17 @@ class Text(Filter):
text = text.lower() text = text.lower()
if self.equals is not None: if self.equals is not None:
self.equals = str(self.equals) self.equals = list(map(lambda s: str(s).lower() if self.ignore_case else str(s), self.equals))
if self.ignore_case: return text in self.equals
self.equals = self.equals.lower()
return text == self.equals
elif self.contains is not None: elif self.contains is not None:
self.contains = str(self.contains) self.contains = list(map(lambda s: str(s).lower() if self.ignore_case else str(s), self.contains))
if self.ignore_case: return any(map(text.__contains__, self.contains))
self.contains = self.contains.lower()
return self.contains in text
elif self.startswith is not None: elif self.startswith is not None:
self.startswith = str(self.startswith) self.startswith = list(map(lambda s: str(s).lower() if self.ignore_case else str(s), self.startswith))
if self.ignore_case: return any(map(text.startswith, self.startswith))
self.startswith = self.startswith.lower()
return text.startswith(self.startswith)
elif self.endswith is not None: elif self.endswith is not None:
self.endswith = str(self.endswith) self.endswith = list(map(lambda s: str(s).lower() if self.ignore_case else str(s), self.endswith))
if self.ignore_case: return any(map(text.endswith, self.endswith))
self.endswith = self.endswith.lower()
return text.endswith(self.endswith)
return False return False