Merge branch 'period-char-username-cutoff-tag-fix' of...

Merge branch 'period-char-username-cutoff-tag-fix' of gitlab.com:benhayward.ben/front into fix/period-char-username-cutoff-tag-89

src/app/common/pipes/tags.spec.ts

@@ -79,6 +79,14 @@ describe('TagPipe', () => {
  expect(transformedString).toContain('<a class="tag"');
  });
 
+ it('should transform when @ followed by `.com`', () => {
+ const pipe = new TagsPipe(featuresServiceMock);
+ const string = 'textstring @name.com';
+ const transformedString = pipe.transform(<any>string);
+ expect(transformedString).toContain('<a class="tag"');
+ expect(transformedString).toContain('@name.com');
+ });
+
  it('should transform to an email', () => {
  const pipe = new TagsPipe(featuresServiceMock);
  const string = 'textstring@name.com';
@@ -90,7 +98,6 @@ describe('TagPipe', () => {
  const pipe = new TagsPipe(featuresServiceMock);
  const string = 'textstring name';
  const transformedString = pipe.transform(<any>string);
-
  expect(transformedString).toEqual(string);
  expect(transformedString).not.toContain('<a class="tag"');
  });

src/app/common/pipes/tags.ts

@@ -39,9 +39,9 @@ export class TagsPipe implements PipeTransform {
  }
  },
  at: {
- rule: /(^|\s|\W)@(\w*[a-zA-Z_-]+\w*)/gim,
+ rule: /(^|\W)@([a-z0-9_\-\.]+[a-z0-9_])(\W|$)/gmi,
  replace: (m) => {
- return `${m.match[1]}<a class="tag" href="/${m.match[2]}" target="_blank">@${m.match[2]}</a>`;
+ return `${m.match[1]}<a class="tag" href="/${m.match[2]}" target="_blank">@${m.match[2]}</a>${m.match[3]}`;
  }
  }
  };