From 55ed1aba63f7f1b97c3890a008c7bf4d73d0cd2b Mon Sep 17 00:00:00 2001
From: duckietm <troop@mailtjes.com>
Date: Wed, 27 Mar 2024 14:47:26 +0100
Subject: [PATCH] Fix sanitize Chatcolor / External Image

---
 src/components/room/widgets/chat/ChatWidgetMessageView.tsx  | 6 +++---
 .../widgets/furniture/useFurnitureExternalImageWidget.ts    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/room/widgets/chat/ChatWidgetMessageView.tsx b/src/components/room/widgets/chat/ChatWidgetMessageView.tsx
index af905cc..a85301d 100644
--- a/src/components/room/widgets/chat/ChatWidgetMessageView.tsx
+++ b/src/components/room/widgets/chat/ChatWidgetMessageView.tsx
@@ -1,6 +1,6 @@
 import { RoomChatSettings, RoomObjectCategory } from '@nitrots/nitro-renderer';
 import { FC, useEffect, useMemo, useRef, useState } from 'react';
-import { ChatBubbleMessage, GetRoomEngine } from '../../../../api';
+import { ChatBubbleMessage, sanitizeColor, GetRoomEngine } from '../../../../api';
 import { useOnClickChat } from '../../../../hooks';
 
 interface ChatWidgetMessageViewProps
@@ -16,7 +16,7 @@ export const ChatWidgetMessageView: FC<ChatWidgetMessageViewProps> = props => {
     const [ isVisible, setIsVisible ] = useState(false);
     const [ isReady, setIsReady ] = useState<boolean>(false);
     const { onClickChat = null } = useOnClickChat();
-    const elementRef = useRef<HTMLDivElement>();;
+    const elementRef = useRef<HTMLDivElement>();
 
     const getBubbleWidth = useMemo(() =>
     {
@@ -89,7 +89,7 @@ export const ChatWidgetMessageView: FC<ChatWidgetMessageViewProps> = props => {
                 </div>
                 <div className="chat-content">
                     <b className="username mr-1" dangerouslySetInnerHTML={ { __html: `${ chat.username }: ` } } />
-                     <span className="message" style={{ color: `${chat.chatColours}` }} dangerouslySetInnerHTML={ { __html: `${chat.formattedText}` }} onClick={ e => onClickChat(e) } />
+                     <span className="message" style={{ color: sanitizeColor(chat.chatColours) }} dangerouslySetInnerHTML={{ __html: `${chat.formattedText}` }} onClick={ e => onClickChat(e) } />
                 </div>
                 <div className="pointer" />
             </div>
diff --git a/src/hooks/rooms/widgets/furniture/useFurnitureExternalImageWidget.ts b/src/hooks/rooms/widgets/furniture/useFurnitureExternalImageWidget.ts
index a628eb0..dbc1d52 100644
--- a/src/hooks/rooms/widgets/furniture/useFurnitureExternalImageWidget.ts
+++ b/src/hooks/rooms/widgets/furniture/useFurnitureExternalImageWidget.ts
@@ -52,7 +52,7 @@ const useFurnitureExternalImageWidgetState = () =>
 
             if(roomObjectPhotoData)
             {
-                index = datas.findIndex(data => (data.u === roomObjectPhotoData.u))
+                index = datas.findIndex(data => (data.w === roomObjectPhotoData.w))
             }
 
             if(index < 0) index = 0;