From 44c5605fb364093d5d88e99c69dc95ecc14e8b95 Mon Sep 17 00:00:00 2001 From: cauefcr Date: Thu, 31 Mar 2022 17:53:33 -0300 Subject: [PATCH 1/2] [Fix] Prevent html rendering on messages --- src/lib/room.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/lib/room.js b/src/lib/room.js index 18e5be2b8..1e873757e 100644 --- a/src/lib/room.js +++ b/src/lib/room.js @@ -163,6 +163,11 @@ Livechat.onTyping((username, isTyping) => { } }); +const scrubMessage = (message) => { + message.msg = message.msg.replace(/(<([^>]+)>)/ig, ''); + return message; +}; + Livechat.onMessage(async (message) => { if (message.ts instanceof Date) { message.ts = message.ts.toISOString(); @@ -175,6 +180,8 @@ Livechat.onMessage(async (message) => { message = transformAgentInformationOnMessage(message); + message = scrubMessage(message); + await store.setState({ messages: upsert(store.state.messages, message, ({ _id }) => _id === message._id, ({ ts }) => ts), }); From 3f7b6e95e68dd0c255fd8c39943b972c407c4809 Mon Sep 17 00:00:00 2001 From: cauefcr Date: Fri, 8 Apr 2022 17:43:17 -0300 Subject: [PATCH 2/2] you only had to read the damn libs, CJ --- src/lib/room.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/lib/room.js b/src/lib/room.js index 1e873757e..31b7e7a16 100644 --- a/src/lib/room.js +++ b/src/lib/room.js @@ -3,7 +3,7 @@ import { route } from 'preact-router'; import { Livechat } from '../api'; import { CallStatus, isCallOngoing } from '../components/Calls/CallStatus'; -import { setCookies, upsert, canRenderMessage } from '../components/helpers'; +import { setCookies, upsert, canRenderMessage, parse } from '../components/helpers'; import { store, initialState } from '../store'; import { normalizeAgent } from './api'; import Commands from './commands'; @@ -163,11 +163,6 @@ Livechat.onTyping((username, isTyping) => { } }); -const scrubMessage = (message) => { - message.msg = message.msg.replace(/(<([^>]+)>)/ig, ''); - return message; -}; - Livechat.onMessage(async (message) => { if (message.ts instanceof Date) { message.ts = message.ts.toISOString(); @@ -180,7 +175,7 @@ Livechat.onMessage(async (message) => { message = transformAgentInformationOnMessage(message); - message = scrubMessage(message); + message.msg = parse(message.msg); await store.setState({ messages: upsert(store.state.messages, message, ({ _id }) => _id === message._id, ({ ts }) => ts),