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

Merge 0696a115bd into 7258d359f1

Browse Source
This commit is contained in:
Jannik 2018-02-18 23:19:11 +00:00 committed by GitHub
commit 117e57c544
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
telethon/events/__init__.py
View File

@ -1,6 +1,7 @@
import abc
import datetime
import itertools
import re
from .. import utils
from ..errors import RPCError
@ -179,13 +180,14 @@ class NewMessage(_EventBuilder):
would not return such thing, this is a custom modification).
"""
def __init__(self, incoming=None, outgoing=None,
chats=None, blacklist_chats=False):
chats=None, blacklist_chats=False, pattern=None):
if incoming and outgoing:
raise ValueError('Can only set either incoming or outgoing')
super().__init__(chats=chats, blacklist_chats=blacklist_chats)
self.incoming = incoming
self.outgoing = outgoing
self.pattern = pattern
def build(self, update):
if isinstance(update,
@ -229,13 +231,15 @@ class NewMessage(_EventBuilder):
return
# Short-circuit if we let pass all events
if all(x is None for x in (self.incoming, self.outgoing, self.chats)):
if all(x is None for x in (self.incoming, self.outgoing, self.chats, self.pattern)):
return event
if self.incoming and event.message.out:
return
if self.outgoing and not event.message.out:
return
if self.pattern and not re.match(self.pattern, event.message.message):
return
return self._filter_event(event)