From f270b509726bfc89fef337826684af6cf17f3f02 Mon Sep 17 00:00:00 2001 From: Bettenbuk Zoltan Date: Mon, 7 Oct 2019 14:39:39 +0200 Subject: [PATCH] fix: remove unnecessary escaping --- react/features/chat/components/web/ChatMessage.js | 8 +------- react/features/chat/middleware.js | 8 ++------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/react/features/chat/components/web/ChatMessage.js b/react/features/chat/components/web/ChatMessage.js index ff58c1ab9..99936d356 100644 --- a/react/features/chat/components/web/ChatMessage.js +++ b/react/features/chat/components/web/ChatMessage.js @@ -30,16 +30,10 @@ class ChatMessage extends AbstractChatMessage { }) : message.message; - // replace links and smileys - // Strophe already escapes special symbols on sending, - // so we escape here only tags to avoid double & - const escMessage = messageToDisplay.replace(//g, '>') - .replace(/\n/g, '
'); const processedMessage = []; // content is an array of text and emoji components - const content = toArray(escMessage, { className: 'smiley' }); + const content = toArray(messageToDisplay, { className: 'smiley' }); content.forEach(i => { if (typeof i === 'string') { diff --git a/react/features/chat/middleware.js b/react/features/chat/middleware.js index d5241e861..a19633fbf 100644 --- a/react/features/chat/middleware.js +++ b/react/features/chat/middleware.js @@ -1,7 +1,5 @@ // @flow -import UIUtil from '../../../modules/UI/util/UIUtil'; - import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../base/app'; import { CONFERENCE_JOINED, @@ -49,12 +47,10 @@ MiddlewareRegistry.register(store => next => action => { const { conference } = store.getState()['features/base/conference']; if (conference) { - const escapedMessage = UIUtil.escapeHtml(action.message); - if (typeof APP !== 'undefined') { - APP.API.notifySendingChatMessage(escapedMessage); + APP.API.notifySendingChatMessage(action.message); } - conference.sendTextMessage(escapedMessage); + conference.sendTextMessage(action.message); } break; }