paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor: Convert user_group_mentions to uppercase.

Browse Source 
Following the convention, we use uppercase for
regex. Also, `user_group_mentions` is given a
conventional name ending with `*_RE`: `USER_GROUP_MENTIONS_RE`.
This commit is contained in:
akshatdalton
2021-05-15 09:38:21 +00:00
committed by Tim Abbott
parent 0a01b1b28e
commit 9f6e6709d3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/markdown/__init__.py
View File

@@ -2231,7 +2231,7 @@ class Markdown(markdown.Markdown):
reg.register(StreamPattern(get_compiled_stream_link_regex(), self), "stream", 85) reg.register(StreamPattern(get_compiled_stream_link_regex(), self), "stream", 85)
reg.register(Timestamp(r"<time:(?P<time>[^>]*?)>"), "timestamp", 75) reg.register(Timestamp(r"<time:(?P<time>[^>]*?)>"), "timestamp", 75)
reg.register( reg.register(
UserGroupMentionPattern(mention.user_group_mentions, self), "usergroupmention", 65 UserGroupMentionPattern(mention.USER_GROUP_MENTIONS_RE, self), "usergroupmention", 65
) )
reg.register(LinkInlineProcessor(markdown.inlinepatterns.LINK_RE, self), "link", 60) reg.register(LinkInlineProcessor(markdown.inlinepatterns.LINK_RE, self), "link", 60)
reg.register(AutoLink(get_web_link_regex(), self), "autolink", 55) reg.register(AutoLink(get_web_link_regex(), self), "autolink", 55)

4
zerver/lib/mention.py
View File

@@ -4,7 +4,7 @@ from typing import Optional, Set, Tuple
# Match multi-word string between @** ** or match any one-word # Match multi-word string between @** ** or match any one-word
# sequences after @ # sequences after @
MENTIONS_RE = r"(?<![^\s\'\"\(,:<])@(?P<silent>_?)(?P<match>\*\*[^\*]+\*\*|all|everyone|stream)" MENTIONS_RE = r"(?<![^\s\'\"\(,:<])@(?P<silent>_?)(?P<match>\*\*[^\*]+\*\*|all|everyone|stream)"
user_group_mentions = r"(?<![^\s\'\"\(,:<])@(\*[^\*]+\*)" USER_GROUP_MENTIONS_RE = r"(?<![^\s\'\"\(,:<])@(\*[^\*]+\*)"
wildcards = ["all", "everyone", "stream"] wildcards = ["all", "everyone", "stream"]
@@ -44,5 +44,5 @@ def extract_user_group(matched_text: str) -> str:
def possible_user_group_mentions(content: str) -> Set[str]: def possible_user_group_mentions(content: str) -> Set[str]:
matches = re.findall(user_group_mentions, content) matches = re.findall(USER_GROUP_MENTIONS_RE, content)
return {extract_user_group(match) for match in matches} return {extract_user_group(match) for match in matches}