Merge pull request #3800 from dan-weaver/bug/mention-regex

fixed mention regex to respect dots in usernames

Author: mxstbr

shared/clients/draft-js/mentions-decorator/test/mentions-decorator.test.js

@@ -55,6 +55,12 @@ describe('strategy', () => {
     expect(mentions[1]).toEqual('@brian');
   });
 
+  it('should allow special characters', () => {
+    const text = "Hey I'm @john-doe, I also go by @john_doe or @john.doe";
+    const mentions = getMentions(text);
+    expect(mentions).toEqual(['@john-doe', '@john_doe', '@john.doe']);
+  });
+
   describe('edge cases', () => {
     it('should handle sentences with compound emojis (withspectrum/spectrum#2077)', () => {
       const text =
@@ -63,5 +69,17 @@ describe('strategy', () => {
       expect(mentions[0]).toEqual('@grdp');
       expect(mentions[1]).toEqual('@rauchg');
     });
+    it('should not include trailing period', () => {
+      const text =
+        "Hey guys it's @abc.123. where is @xyz? Any news from that guy?  @abc.123... over and out. cc: @some.other.person- @ceo; @hr,.";
+
+      const mentions = getMentions(text);
+      expect(mentions[0]).toEqual('@abc.123');
+      expect(mentions[1]).toEqual('@xyz');
+      expect(mentions[2]).toEqual('@abc.123');
+      expect(mentions[3]).toEqual('@some.other.person-');
+      expect(mentions[4]).toEqual('@ceo');
+      expect(mentions[5]).toEqual('@hr');
+    });
   });
 });

shared/regexps.js

@@ -1,5 +1,5 @@
 // @flow
 
-module.exports.MENTIONS = /\/?\B@[a-z0-9_-]+/gi;
+module.exports.MENTIONS = /\/?\B@[a-z0-9._-]+[a-z0-9_-]/gi;
 module.exports.URL = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&\/=]*)/gi;
 module.exports.RELATIVE_URL = /^\/([^\/].*|$)/g;