Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix message mention link regex

Browse Source 
Also stop trying to autolink strings like "$messageId:example.org" in message
text, matrix.tpo message links need a room ID to make sense.
This commit is contained in:
miruka 2020-05-20 07:54:40 -04:00
parent 8823077a1c
commit 7719df0135
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend/html_markdown.py
View File

@ -127,9 +127,6 @@ class HTMLProcessor:
room_alias_regex = re.compile( room_alias_regex = re.compile(
r"(?=^|\W)(?P<body>#\S+?:(?P<host>[a-zA-Z\d.-:]*[a-zA-Z\d]))", r"(?=^|\W)(?P<body>#\S+?:(?P<host>[a-zA-Z\d.-:]*[a-zA-Z\d]))",
) )
message_id_regex = re.compile(
rf"(?P<body>\${opaque_id}:(?P<host>[a-zA-Z\d.-:]*[a-zA-Z\d]))",
)
link_regexes = [re.compile(r, re.IGNORECASE) link_regexes = [re.compile(r, re.IGNORECASE)
if isinstance(r, str) else r for r in [ if isinstance(r, str) else r for r in [
@ -144,7 +141,7 @@ class HTMLProcessor:
# magnet: # magnet:
r"(?P<body>magnet:\?xt=urn:[a-z0-9]+:.+)(?P<host>)", r"(?P<body>magnet:\?xt=urn:[a-z0-9]+:.+)(?P<host>)",
user_id_regex, room_id_regex, room_alias_regex, message_id_regex, user_id_regex, room_id_regex, room_alias_regex,
]] ]]
link_is_matrix_to_regex = re.compile( link_is_matrix_to_regex = re.compile(
@ -160,7 +157,7 @@ class HTMLProcessor:
r"https?://matrix.to/#/#\S+", re.IGNORECASE, r"https?://matrix.to/#/#\S+", re.IGNORECASE,
) )
link_is_message_id_regex = re.compile( link_is_message_id_regex = re.compile(
r"https?://matrix.to/#/\$\S+", re.IGNORECASE, r"https?://matrix.to/#/[!#]\S+/\$\S+", re.IGNORECASE,
) )
inline_quote_regex = re.compile(r"(^|⏎)(\s*&gt;[^⏎\n]*)", re.MULTILINE) inline_quote_regex = re.compile(r"(^|⏎)(\s*&gt;[^⏎\n]*)", re.MULTILINE)
@ -464,7 +461,6 @@ class HTMLProcessor:
id_regexes = ( id_regexes = (
self.user_id_regex, self.room_id_regex, self.room_alias_regex, self.user_id_regex, self.room_id_regex, self.room_alias_regex,
self.message_id_regex,
) )
for regex in id_regexes: for regex in id_regexes:
@ -484,14 +480,20 @@ class HTMLProcessor:
def _matrix_to_links_add_classes(self, el: HtmlElement) -> HtmlElement: def _matrix_to_links_add_classes(self, el: HtmlElement) -> HtmlElement:
"Add special CSS classes to matrix.to mention links.""" """Add special CSS classes to matrix.to mention links."""
href = unquote(el.attrib.get("href", "")) href = unquote(el.attrib.get("href", ""))
if not href or not el.text: if not href or not el.text:
return el return el
if self.link_is_user_id_regex.match(href):
# This must be first, or link will be mistaken by room ID/alias regex
if self.link_is_message_id_regex.match(href):
el.attrib["class"] = "mention message-id-mention"
el.attrib["data-mention"] = el.text.strip()
elif self.link_is_user_id_regex.match(href):
if el.text.strip().startswith("@"): if el.text.strip().startswith("@"):
el.attrib["class"] = "mention user-id-mention" el.attrib["class"] = "mention user-id-mention"
else: else:
@ -507,10 +509,6 @@ class HTMLProcessor:
el.attrib["class"] = "mention room-alias-mention" el.attrib["class"] = "mention room-alias-mention"
el.attrib["data-mention"] = el.text.strip() el.attrib["data-mention"] = el.text.strip()
elif self.link_is_message_id_regex.match(href):
el.attrib["class"] = "mention message-id-mention"
el.attrib["data-mention"] = el.text.strip()
return el return el