fix: parsing the links with unconventional tlds (#2241)

Author: vishalnarkhede

package/package.json

@@ -72,7 +72,7 @@
     "dayjs": "1.10.5",
     "file-loader": "6.2.0",
     "i18next": "20.2.4",
-    "linkify-it": "^4.0.1",
+    "linkifyjs": "^4.1.1",
     "lodash-es": "4.17.21",
     "metro-react-native-babel-preset": "0.66.2",
     "mime-types": "^2.1.34",

package/src/components/Message/MessageSimple/utils/parseLinks.test.ts

@@ -14,7 +14,8 @@ describe('parseLinksFromText', () => {
       'https://localhost/with/path?and=query#fragment',
       'https://localhost/with/path?and=query#fragment',
     ],
-    ['reactnative.stream', undefined],
+    ['reactnative.dev', 'http://reactnative.dev'],
+    ['hinge.health/schedule-with-a-coach', 'http://hinge.health/schedule-with-a-coach'],
     [
       'https://zh.wikipedia.org/wiki/挪威牛油危機',
       'https://zh.wikipedia.org/wiki/%E6%8C%AA%E5%A8%81%E7%89%9B%E6%B2%B9%E5%8D%B1%E6%A9%9F',
@@ -87,29 +88,4 @@ describe('parseLinksFromText', () => {
       raw: input,
     });
   });
-  it('doest not report invalid tlds as urls', () => {
-    const input = `
-    %
-    % Not links
-    %
-    example.invalid
-    example.invalid/
-    http://.example.com
-    http://-example.com
-    hppt://example.com
-    example.coma
-    -example.coma
-        `;
-    const result = parseLinksFromText(input);
-    expect(result).toHaveLength(0);
-  });
-  it('does not parse a decimal number as a URL', () => {
-    const input = '123.456';
-    const result = parseLinksFromText(input);
-    expect(result).toHaveLength(0);
-  });
-  it.each([['@user'], ['@user.name']])('does not parse %p as a URL', (input) => {
-    const result = parseLinksFromText(input);
-    expect(result).toHaveLength(0);
-  });
 });

package/src/components/Message/MessageSimple/utils/parseLinks.ts

@@ -1,4 +1,4 @@
-import Linkify from 'linkify-it';
+import { find } from 'linkifyjs';
 
 interface LinkInfo {
   encodedUrl: string;
@@ -23,13 +23,13 @@ export const parseLinksFromText = (input: string): LinkInfo[] => {
     input,
   );
 
-  const linkify = Linkify();
-  const matches = linkify.match(strippedInput) ?? [];
+  const links = find(strippedInput, 'url');
+  const emails = find(strippedInput, 'email');
 
-  const result: LinkInfo[] = matches.map((match) => {
-    const { raw, url } = match;
-    return { encodedUrl: encodeURI(url), raw };
-  });
+  const result: LinkInfo[] = [...links, ...emails].map(({ href, value }) => ({
+    encodedUrl: encodeURI(href),
+    raw: value,
+  }));
 
   return result;
 };

package/yarn.lock

@@ -6998,12 +6998,10 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-linkify-it@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
-  integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==
-  dependencies:
-    uc.micro "^1.0.1"
+linkifyjs@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.1.1.tgz#73d427e3bbaaf4ca8e71c589ad4ffda11a9a5fde"
+  integrity sha512-zFN/CTVmbcVef+WaDXT63dNzzkfRBKT1j464NJQkV7iSgJU0sLBus9W0HBwnXK13/hf168pbrx/V/bjEHOXNHA==
 
 loader-runner@^2.4.0:
   version "2.4.0"
@@ -10036,11 +10034,6 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
   integrity sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==
 
-uc.micro@^1.0.1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
-  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
-
 uglify-es@^3.1.9:
   version "3.3.9"
   resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"