From de99e26ca208d800c606bde64cd278dbb145633a Mon Sep 17 00:00:00 2001 From: Nicholas Pease Date: Thu, 18 Apr 2024 12:47:02 -0400 Subject: [PATCH] Properly Integrate Images, RMF and Profane filters --- frontend-next/src/components/app/datatypes.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend-next/src/components/app/datatypes.js b/frontend-next/src/components/app/datatypes.js index dbb8b10..72a28fc 100644 --- a/frontend-next/src/components/app/datatypes.js +++ b/frontend-next/src/components/app/datatypes.js @@ -42,7 +42,7 @@ function RMF(message) { var IMG_END = [".jpg", ".jpeg", ".png", ".gif", ".webp"] var URLREGEX = /[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/g; var URLmatch = message.match(URLREGEX); - var newMessage = [] + var newMessage = URLmatch ? [] : message if (URLmatch) { for (var i = 0; i < URLmatch.length; i++) { if (IMG_END.includes(URLmatch[i].slice(-4)) || IMG_END.includes(URLmatch[i].slice(-5))) { @@ -107,9 +107,10 @@ const generateColor = (user_str) => { * @returns {Object} - Chat Message Component */ export function Chat({ chatObj }) { - var message = RMF(chatObj.body) - if (message) - message = filter.clean(message) + if (chatObj.body) { + var message = filter.clean(chatObj.body) + message = RMF(message) + } return (
-- 2.52.0