diff --git a/files/helpers/regex.py b/files/helpers/regex.py index da1646f46..d5ff3fbef 100644 --- a/files/helpers/regex.py +++ b/files/helpers/regex.py @@ -9,6 +9,7 @@ valid_username_regex = re.compile("^[\w-]{3,25}$", flags=re.A) valid_username_patron_regex = re.compile("^[\w-]{1,25}$", flags=re.A) mention_regex = re.compile('(?)!(everyone)' + NOT_IN_CODE_OR_LINKS, flags=re.A) diff --git a/files/routes/chat.py b/files/routes/chat.py index 3215f418b..f261e41f3 100644 --- a/files/routes/chat.py +++ b/files/routes/chat.py @@ -322,8 +322,8 @@ def messagereply(v): execute_blackjack(v, c, c.body_html, 'chat') execute_under_siege(v, c, c.body_html, 'chat') - if mention_regex.fullmatch(c.body): - uid = get_user(c.body[1:], attributes=[User.id]).id + if dm_adding_regex.fullmatch(c.body): + uid = get_user(c.body[2:], attributes=[User.id]).id if uid not in parent.group_dm_ids: parent.group_dm_ids.append(uid) g.db.add(parent)