Merge branch 'develop' into asyncio

# Conflicts:
#	pyrogram/client/client.py
This commit is contained in:
Dan 2018-06-20 12:24:30 +02:00
commit f9c17ae169

View File

@ -25,7 +25,7 @@ from ...session.internals import MsgId
class BaseClient:
INVITE_LINK_RE = re.compile(r"^(?:https?://)?(?:t\.me/joinchat/)([\w-]+)$")
INVITE_LINK_RE = re.compile(r"^(?:https?://)?(?:www\.)?(?:t(?:elegram)?\.(?:org|me|dog)/joinchat/)([\w-]+)$")
BOT_TOKEN_RE = re.compile(r"^\d+:[\w-]+$")
DIALOGS_AT_ONCE = 100
UPDATES_WORKERS = 1