Xtao-Labs/MTPyroger
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docs

Browse Source
This commit is contained in:
Dan 2018-02-14 15:54:54 +01:00
commit 5b3e5133d8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pyrogram/client/client.py
View File

@ -1086,6 +1086,7 @@ class Client:
duration: int = 0,
width: int = 0,
height: int = 0,
supports_streaming: bool = None,
disable_notification: bool = None,
reply_to_message_id: int = None):
"""Use this method to send video files.
@ -1117,6 +1118,9 @@ class Client:
height (:obj:`int`, optional):
Video height.
supports_streaming (:obj:`bool`, optional):
Pass True, if the uploaded video is suitable for streaming.
disable_notification (:obj:`bool`, optional):
Sends the message silently.
Users will receive a notification with no sound.
@ -1143,6 +1147,7 @@ class Client:
file=file,
attributes=[
types.DocumentAttributeVideo(
supports_streaming=supports_streaming,
duration=duration,
w=width,
h=height

4
pyrogram/client/style/html.py
View File

@ -31,7 +31,7 @@ from . import utils
class HTML:
HTML_RE = re.compile(r"<(\w+)(?: href=([\"'])(.*)\2)?>(.*)</\1>")
HTML_RE = re.compile(r"<(\w+)(?: href=([\"'])([^<]+)\2)?>([^>]+)</\1>")
MENTION_RE = re.compile(r"tg://user\?id=(\d+)")
def __init__(self, peers_by_id):
@ -44,7 +44,7 @@ class HTML:
for match in self.HTML_RE.finditer(text):
start = match.start() - offset
style, url, body = match.groups()
style, url, body = match.group(1, 3, 4)
if url:
mention = self.MENTION_RE.match(url)