From 6e6f8a13e10aa8b8eaa18f382e99f157fd36908d Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 30 Sep 2019 20:37:50 -0600 Subject: [PATCH] Handle BigEmoji permalinks better Now that permalinks could be not-matrix.to we should be safer in what we'll allow. --- src/HtmlUtils.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js index 7fc6908caf..3620eb2973 100644 --- a/src/HtmlUtils.js +++ b/src/HtmlUtils.js @@ -447,10 +447,12 @@ export function bodyToHtml(content, highlights, opts={}) { const match = BIGEMOJI_REGEX.exec(contentBodyTrimmed); emojiBody = match && match[0] && match[0].length === contentBodyTrimmed.length && // Prevent user pills expanding for users with only emoji in - // their username + // their username. Permalinks (links in pills) can be any URL + // now, so we just check for an HTTP-looking thing. ( content.formatted_body == undefined || - !content.formatted_body.includes("https://matrix.to/") + !content.formatted_body.includes("http:") || + !content.formatted_body.includes("https:") ); }