mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Skip URLs that include the @ symbol when generating links

Browse source 
Thanks to mcsim for the bug report.
This commit is contained in:
Scott Nonnenberg 2019-03-18 14:07:10 -07:00
parent 3b140d9b51
commit c1b680eeb4
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ts/components/conversation/Linkify.tsx
View file

@ -14,6 +14,7 @@ interface Props {
} }
const SUPPORTED_PROTOCOLS = /^(http|https):/i; const SUPPORTED_PROTOCOLS = /^(http|https):/i;
const HAS_AT = /@/;
export class Linkify extends React.Component<Props> { export class Linkify extends React.Component<Props> {
public static defaultProps: Partial<Props> = { public static defaultProps: Partial<Props> = {
@ -50,7 +51,11 @@ export class Linkify extends React.Component<Props> {
} }
const { url, text: originalText } = match; const { url, text: originalText } = match;
if (SUPPORTED_PROTOCOLS.test(url) && !isLinkSneaky(url)) { if (
SUPPORTED_PROTOCOLS.test(url) &&
!isLinkSneaky(url) &&
!HAS_AT.test(url)
) {
results.push( results.push(
<a key={count++} href={url}> <a key={count++} href={url}>
{originalText} {originalText}