markdown: Fix client usermention regular expression.

Fixes zulip#993.
Xuxiaotianonlyone · Nov 7, 2016 · 07d0539 · 07d0539
1 parent 44767c5
commit 07d0539
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/frontend_tests/node_tests/echo.js b/frontend_tests/node_tests/echo.js
@@ -215,4 +215,16 @@ var bugdown_data = JSON.parse(fs.readFileSync(path.join(__dirname, '../../zerver
   assert.equal(message.flags.length, 2);
   assert(message.flags.indexOf('read') !== -1);
   assert(message.flags.indexOf('mentioned') !== -1);
+
+  input = "test @all";
+  message = {subject: "No links here", content: echo.apply_markdown(input), raw_content: input};
+  echo._add_message_flags(message);
+  assert.equal(message.flags.length, 2);
+  assert(message.flags.indexOf('mentioned') !== -1);
+
+  input = "test @any";
+  message = {subject: "No links here", content: echo.apply_markdown(input), raw_content: input};
+  echo._add_message_flags(message);
+  assert.equal(message.flags.length, 1);
+  assert(message.flags.indexOf('mentioned') === -1);
 }());
diff --git a/static/third/marked/lib/marked.js b/static/third/marked/lib/marked.js
@@ -536,7 +536,7 @@ inline.breaks = merge({}, inline.gfm, {
 inline.zulip = merge({}, inline.breaks, {
   emoji: /^:([A-Za-z0-9_\-\+]+?):/,
   unicodeemoji: /^(\ud83c[\udf00-\udfff]|\ud83d[\udc00-\ude4f]|\ud83d[\ude80-\udeff])/,
-  usermention: /^(@\*\*([^\*]+)?\*\*)/m,
+  usermention: /^(@(?:\*\*([^\*]+)?\*\*|(\w+)?))/m, // Match multi-word string between @** ** or match any one-word
   avatar: /^!avatar\(([^)]+)\)/,
   gravatar: /^!gravatar\(([^)]+)\)/,
   realm_filters: [],
@@ -721,7 +721,7 @@ InlineLexer.prototype.output = function(src) {
     // usermention (zulip)
     if (cap = this.rules.usermention.exec(src)) {
       src = src.substring(cap[0].length);
-      out += this.usermention(cap[2], cap[1]);
+      out += this.usermention(cap[2] || cap[3], cap[1]);
       continue;
     }