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

Use constants and allow empty URL regex when parsing markdown

Browse Source
This commit is contained in:
Lonami Exo 2017-10-29 18:21:21 +01:00
parent d47a9f83d0
commit 2609bd9bd1
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
telethon/extensions/markdown.py
View File

@ -70,6 +70,16 @@ EMOJI_RANGES = (
) )
DEFAULT_DELIMITERS = {
'**': Mode.BOLD,
'__': Mode.ITALIC,
'`': Mode.CODE,
'```': Mode.PRE
}
DEFAULT_URL_RE = re.compile(r'\[(.+?)\]\((.+?)\)')
def is_emoji(char): def is_emoji(char):
"""Returns True if 'char' looks like an emoji""" """Returns True if 'char' looks like an emoji"""
char = ord(char) char = ord(char)
@ -92,7 +102,7 @@ def emojiness(char):
return 3 return 3
def parse(message, delimiters=None, url_re=r'\[(.+?)\]\((.+?)\)'): def parse(message, delimiters=None, url_re=None):
""" """
Parses the given message and returns the stripped message and a list Parses the given message and returns the stripped message and a list
of tuples containing (start, end, mode) using the specified delimiters of tuples containing (start, end, mode) using the specified delimiters
@ -101,20 +111,16 @@ def parse(message, delimiters=None, url_re=r'\[(.+?)\]\((.+?)\)'):
The url_re(gex) must contain two matching groups: the text to be The url_re(gex) must contain two matching groups: the text to be
clickable and the URL itself. clickable and the URL itself.
""" """
if url_re: if url_re is None:
url_re = DEFAULT_URL_RE
elif url_re:
if isinstance(url_re, str): if isinstance(url_re, str):
url_re = re.compile(url_re) url_re = re.compile(url_re)
if not delimiters: if not delimiters:
if delimiters is not None: if delimiters is not None:
return message, [] return message, []
delimiters = DEFAULT_DELIMITERS
delimiters = {
'**': Mode.BOLD,
'__': Mode.ITALIC,
'`': Mode.CODE,
'```': Mode.PRE
}
result = [] result = []
current = Mode.NONE current = Mode.NONE
@ -122,7 +128,7 @@ def parse(message, delimiters=None, url_re=r'\[(.+?)\]\((.+?)\)'):
i = 0 i = 0
while i < len(message): while i < len(message):
url_match = None url_match = None
if current == Mode.NONE: if url_re and current == Mode.NONE:
url_match = url_re.match(message, pos=i) url_match = url_re.match(message, pos=i)
if url_match: if url_match:
message = ''.join(( message = ''.join((