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

Merge faf2142122 into c6d821910e

Browse Source
This commit is contained in:
Emilio Molinari 2018-03-22 22:45:37 +00:00 committed by GitHub
commit 7d5f0e5227
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
telethon/events/__init__.py
View File

@ -235,12 +235,14 @@ class NewMessage(_EventBuilder):
super().__init__(chats=chats, blacklist_chats=blacklist_chats) super().__init__(chats=chats, blacklist_chats=blacklist_chats)
self.incoming = incoming self.incoming = incoming
self.outgoing = outgoing self.outgoing = outgoing
if isinstance(pattern, str): if pattern is None or utils.is_list_like(pattern):
self.pattern = re.compile(pattern).match
elif not pattern or callable(pattern):
self.pattern = pattern self.pattern = pattern
elif isinstance(pattern, str):
self.pattern = [re.compile(pattern).match]
elif 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