diff --git a/app/autolinker/client/client.js b/app/autolinker/client/client.js index f020b65c96fa..07b44e4e3f76 100644 --- a/app/autolinker/client/client.js +++ b/app/autolinker/client/client.js @@ -4,7 +4,7 @@ import Autolinker from 'autolinker'; import { escapeRegExp } from '../../../lib/escapeRegExp'; -export const createAutolinkerMessageRenderer = (config) => +export const createAutolinkerMessageRenderer = ({ phone, ...config }) => (message) => { if (!message.html?.trim()) { return message; @@ -24,8 +24,10 @@ export const createAutolinkerMessageRenderer = (config) => if (regexTokens && regexTokens.test(msgPart)) { return msgPart; } - return Autolinker.link(msgPart, { + + const muttableConfig = { ...config, + phone: false, stripTrailingSlash: false, replaceFn: (match) => { const token = `=!=${ Random.id() }=!=`; @@ -41,7 +43,14 @@ export const createAutolinkerMessageRenderer = (config) => text: tag.toAnchorString(), }); return token; - } }); + }, + }; + + const autolinkerMsg = Autolinker.link(msgPart, muttableConfig); + + muttableConfig.phone = phone; + + return phone ? Autolinker.link(autolinkerMsg, muttableConfig) : autolinkerMsg; }) .join(''); diff --git a/package-lock.json b/package-lock.json index 5e79672d7f7e..864f59dcd019 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15773,9 +15773,12 @@ "dev": true }, "autolinker": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-1.8.3.tgz", - "integrity": "sha512-FtH5edduS5XwI1u9tLirRJv33ql5ualzHflFWX/ko5bggDXI8llFG/347VZGK2NAeDXuTh9p5xvCGQ+UrgpjtQ==" + "version": "3.14.3", + "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-3.14.3.tgz", + "integrity": "sha512-t81i2bCpS+s+5FIhatoww9DmpjhbdiimuU9ATEuLxtZMQ7jLv9fyFn7SWNG8IkEfD4AmYyirL1ss9k1aqVWRvg==", + "requires": { + "tslib": "^1.9.3" + } }, "autoprefixer": { "version": "9.8.6", @@ -38514,8 +38517,7 @@ "tslib": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", - "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==", - "dev": true + "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" }, "tsutils": { "version": "3.17.1", diff --git a/package.json b/package.json index d85df26e23e0..5bd155f3ea4f 100644 --- a/package.json +++ b/package.json @@ -171,7 +171,7 @@ "archiver": "^3.1.1", "arraybuffer-to-string": "^1.0.2", "atlassian-crowd": "^0.5.0", - "autolinker": "^1.8.3", + "autolinker": "^3.14.3", "aws-sdk": "^2.735.0", "bad-words": "^3.0.3", "bcrypt": "^5.0.0",