From 075b7b2e650b6f40fccb06465fe87c5230f50359 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilherme@gazzo.xyz>
Date: Fri, 24 Jul 2020 09:51:58 -0300
Subject: [PATCH 1/3] Fix mentions thread view

---
 app/threads/client/components/ThreadComponent.js | 3 ++-
 app/threads/client/lib/normalizeThreadTitle.js   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/threads/client/components/ThreadComponent.js b/app/threads/client/components/ThreadComponent.js
index 36dcdd58f094..37d3157f4f14 100644
--- a/app/threads/client/components/ThreadComponent.js
+++ b/app/threads/client/components/ThreadComponent.js
@@ -13,6 +13,7 @@ import { call } from '../../../ui-utils/client';
 import { useTranslation } from '../../../../client/contexts/TranslationContext';
 import VerticalBar from '../../../../client/components/basic/VerticalBar';
 import { normalizeThreadTitle } from '../lib/normalizeThreadTitle';
+import RawText from '../../../../client/components/basic/RawText';
 
 export default function ThreadComponent({ mid, rid, jump, room, ...props }) {
 	const t = useTranslation();
@@ -88,7 +89,7 @@ export default function ThreadComponent({ mid, rid, jump, room, ...props }) {
 			<VerticalBar rcx-thread-view width='full' style={style} display='flex' flexDirection='column' position='absolute' { ...!expanded && { width: '380px' } }>
 				<VerticalBar.Header>
 					<VerticalBar.Icon name='thread' />
-					<VerticalBar.Text>{headerTitle}</VerticalBar.Text>
+					<VerticalBar.Text><RawText>{headerTitle}</RawText></VerticalBar.Text>
 					<VerticalBar.Action aria-label={expandLabel} onClick={handleExpandButton} name={expandIcon}/>
 					<VerticalBar.Action aria-label={actionLabel} onClick={handleFollowButton} name={button}/>
 					<VerticalBar.Close aria-label={t('Close')} onClick={handleClose}/>
diff --git a/app/threads/client/lib/normalizeThreadTitle.js b/app/threads/client/lib/normalizeThreadTitle.js
index c2d9aaf01006..1eae0c55afb6 100644
--- a/app/threads/client/lib/normalizeThreadTitle.js
+++ b/app/threads/client/lib/normalizeThreadTitle.js
@@ -8,7 +8,7 @@ import { MentionsParser } from '../../../mentions/lib/MentionsParser';
 
 export const normalizeThreadTitle = ({ ...message }) => {
 	if (message.msg) {
-		const filteredMessage = filterMarkdown(message.msg);
+		const filteredMessage = filterMarkdown(s.escapeHTML(message.msg));
 		if (!message.channels && !message.mentions) {
 			return filteredMessage;
 		}

From e69a85ea3328d4aa0d999ef6d9f3758e8df6d50c Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 24 Jul 2020 15:24:13 -0300
Subject: [PATCH 2/3] Update ThreadComponent.js

---
 app/threads/client/components/ThreadComponent.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/threads/client/components/ThreadComponent.js b/app/threads/client/components/ThreadComponent.js
index 37d3157f4f14..f2034f7ff740 100644
--- a/app/threads/client/components/ThreadComponent.js
+++ b/app/threads/client/components/ThreadComponent.js
@@ -13,7 +13,6 @@ import { call } from '../../../ui-utils/client';
 import { useTranslation } from '../../../../client/contexts/TranslationContext';
 import VerticalBar from '../../../../client/components/basic/VerticalBar';
 import { normalizeThreadTitle } from '../lib/normalizeThreadTitle';
-import RawText from '../../../../client/components/basic/RawText';
 
 export default function ThreadComponent({ mid, rid, jump, room, ...props }) {
 	const t = useTranslation();
@@ -89,7 +88,7 @@ export default function ThreadComponent({ mid, rid, jump, room, ...props }) {
 			<VerticalBar rcx-thread-view width='full' style={style} display='flex' flexDirection='column' position='absolute' { ...!expanded && { width: '380px' } }>
 				<VerticalBar.Header>
 					<VerticalBar.Icon name='thread' />
-					<VerticalBar.Text><RawText>{headerTitle}</RawText></VerticalBar.Text>
+					<VerticalBar.Text dangerouslySetInnerHTML={{ __html: headerTitle}} />
 					<VerticalBar.Action aria-label={expandLabel} onClick={handleExpandButton} name={expandIcon}/>
 					<VerticalBar.Action aria-label={actionLabel} onClick={handleFollowButton} name={button}/>
 					<VerticalBar.Close aria-label={t('Close')} onClick={handleClose}/>

From 030e36bd0e9a2770c6deac7b12e93968f6f6c31d Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 24 Jul 2020 16:54:25 -0300
Subject: [PATCH 3/3] Update ThreadComponent.js

---
 app/threads/client/components/ThreadComponent.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/threads/client/components/ThreadComponent.js b/app/threads/client/components/ThreadComponent.js
index f2034f7ff740..9cbcddf06f94 100644
--- a/app/threads/client/components/ThreadComponent.js
+++ b/app/threads/client/components/ThreadComponent.js
@@ -88,7 +88,7 @@ export default function ThreadComponent({ mid, rid, jump, room, ...props }) {
 			<VerticalBar rcx-thread-view width='full' style={style} display='flex' flexDirection='column' position='absolute' { ...!expanded && { width: '380px' } }>
 				<VerticalBar.Header>
 					<VerticalBar.Icon name='thread' />
-					<VerticalBar.Text dangerouslySetInnerHTML={{ __html: headerTitle}} />
+					<VerticalBar.Text dangerouslySetInnerHTML={{ __html: headerTitle }} />
 					<VerticalBar.Action aria-label={expandLabel} onClick={handleExpandButton} name={expandIcon}/>
 					<VerticalBar.Action aria-label={actionLabel} onClick={handleFollowButton} name={button}/>
 					<VerticalBar.Close aria-label={t('Close')} onClick={handleClose}/>