LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-08-06 21:20:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed events.NewMessage to accept a list of patterns instead of just 1

Browse Source
This commit is contained in:
Emilio Molinari 2018-03-21 15:38:43 +01:00
parent 95f368201e
commit 071ebcb4ef
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
telethon/events/__init__.py
View File

@ -236,11 +236,13 @@ class NewMessage(_EventBuilder):
self.incoming = incoming self.incoming = incoming
self.outgoing = outgoing self.outgoing = outgoing
if isinstance(pattern, str): if isinstance(pattern, str):
self.pattern = re.compile(pattern).match self.pattern = [re.compile(pattern).match]
elif not pattern or callable(pattern): elif isinstance(pattern, (list, tuple)):
self.pattern = pattern self.pattern = pattern
elif not pattern or callable(pattern):
self.pattern = [pattern]
elif hasattr(pattern, 'match') and callable(pattern.match): elif hasattr(pattern, 'match') and callable(pattern.match):
self.pattern = pattern.match self.pattern = [pattern.match]
else: else:
raise TypeError('Invalid pattern type given') raise TypeError('Invalid pattern type given')
@ -300,8 +302,11 @@ class NewMessage(_EventBuilder):
return return
if self.pattern: if self.pattern:
match = self.pattern(event.message.message or '') for pattern in self.pattern:
if not match: match = pattern(event.message.message or '')
if match is not None:
break
else:
return return
event.pattern_match = match event.pattern_match = match