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

Don't linkify when certain unicode formatting characters are present

Browse source
This commit is contained in:
Scott Nonnenberg 2022-03-28 17:28:37 -07:00 • committed by GitHub
parent e62606361d
commit 006de5b1a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@ import React from 'react';
import LinkifyIt from 'linkify-it';
import type { RenderTextCallbackType } from '../../types/Util';
import { isLinkSneaky } from '../../types/LinkPreview';
import { isLinkSneaky, shouldLinkifyMessage } from '../../types/LinkPreview';
import { splitByEmoji } from '../../util/emoji';
import { missingCaseError } from '../../util/missingCaseError';
@ -333,6 +333,10 @@ export class Linkify extends React.Component<Props> {
| Array<JSX.Element | string | null> {
const { text, renderNonLink } = this.props;
if (!shouldLinkifyMessage(text)) {
return text;
}
// We have to do this, because renderNonLink is not required in our Props object,
// but it is always provided via defaultProps.
if (!renderNonLink) {