Merge pull request #1955 from warrickct/link-message-validation-fix

Removing at regex test preventing some urls from rendering as links.
oxen-io · Oct 8, 2021 · 19425c9 · 19425c9
2 parents af12e2c + 5eba4a6
commit 19425c9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ts/components/conversation/Linkify.tsx b/ts/components/conversation/Linkify.tsx
@@ -17,7 +17,6 @@ interface Props {
 }
 
 const SUPPORTED_PROTOCOLS = /^(http|https):/i;
-const HAS_AT = /@/;
 
 export class Linkify extends React.Component<Props> {
   public static defaultProps: Partial<Props> = {
@@ -49,7 +48,8 @@ export class Linkify extends React.Component<Props> {
       }
 
       const { url, text: originalText } = match;
-      if (SUPPORTED_PROTOCOLS.test(url) && !isLinkSneaky(url) && !HAS_AT.test(url)) {
+      const isLink = SUPPORTED_PROTOCOLS.test(url) && !isLinkSneaky(url);
+      if (isLink) {
         results.push(
           <a key={count++} href={url} onClick={this.handleClick}>
             {originalText}