Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing at regex test preventing some urls from rendering as links. #1955

Merged
merged 1 commit into from
Oct 8, 2021
Merged

Removing at regex test preventing some urls from rendering as links. #1955

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ts/components/conversation/Linkify.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> = {
Expand Down Expand Up @@ -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}
Expand Down