From 9f6e6709d35d5adb51bc6c7462cc85d6d2d28f28 Mon Sep 17 00:00:00 2001 From: akshatdalton Date: Sat, 15 May 2021 09:38:21 +0000 Subject: [PATCH] minor: Convert `user_group_mentions` to uppercase. Following the convention, we use uppercase for regex. Also, `user_group_mentions` is given a conventional name ending with `*_RE`: `USER_GROUP_MENTIONS_RE`. --- zerver/lib/markdown/__init__.py | 2 +- zerver/lib/mention.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zerver/lib/markdown/__init__.py b/zerver/lib/markdown/__init__.py index d217cf5c96..e6081b1e07 100644 --- a/zerver/lib/markdown/__init__.py +++ b/zerver/lib/markdown/__init__.py @@ -2231,7 +2231,7 @@ class Markdown(markdown.Markdown): reg.register(StreamPattern(get_compiled_stream_link_regex(), self), "stream", 85) reg.register(Timestamp(r"[^>]*?)>"), "timestamp", 75) 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(AutoLink(get_web_link_regex(), self), "autolink", 55) diff --git a/zerver/lib/mention.py b/zerver/lib/mention.py index 42c48e4dc0..4c2e18ca4b 100644 --- a/zerver/lib/mention.py +++ b/zerver/lib/mention.py @@ -4,7 +4,7 @@ from typing import Optional, Set, Tuple # Match multi-word string between @** ** or match any one-word # sequences after @ MENTIONS_RE = r"(?_?)(?P\*\*[^\*]+\*\*|all|everyone|stream)" -user_group_mentions = r"(? 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}