Fix sanitize Chatcolor / External Image

This commit is contained in:
duckietm 2024-03-27 14:47:26 +01:00
parent 47c8455b95
commit 55ed1aba63
2 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
import { RoomChatSettings, RoomObjectCategory } from '@nitrots/nitro-renderer'; import { RoomChatSettings, RoomObjectCategory } from '@nitrots/nitro-renderer';
import { FC, useEffect, useMemo, useRef, useState } from 'react'; import { FC, useEffect, useMemo, useRef, useState } from 'react';
import { ChatBubbleMessage, GetRoomEngine } from '../../../../api'; import { ChatBubbleMessage, sanitizeColor, GetRoomEngine } from '../../../../api';
import { useOnClickChat } from '../../../../hooks'; import { useOnClickChat } from '../../../../hooks';
interface ChatWidgetMessageViewProps interface ChatWidgetMessageViewProps
@ -16,7 +16,7 @@ export const ChatWidgetMessageView: FC<ChatWidgetMessageViewProps> = props => {
const [ isVisible, setIsVisible ] = useState(false); const [ isVisible, setIsVisible ] = useState(false);
const [ isReady, setIsReady ] = useState<boolean>(false); const [ isReady, setIsReady ] = useState<boolean>(false);
const { onClickChat = null } = useOnClickChat(); const { onClickChat = null } = useOnClickChat();
const elementRef = useRef<HTMLDivElement>();; const elementRef = useRef<HTMLDivElement>();
const getBubbleWidth = useMemo(() => const getBubbleWidth = useMemo(() =>
{ {
@ -89,7 +89,7 @@ export const ChatWidgetMessageView: FC<ChatWidgetMessageViewProps> = props => {
</div> </div>
<div className="chat-content"> <div className="chat-content">
<b className="username mr-1" dangerouslySetInnerHTML={ { __html: `${ chat.username }: ` } } /> <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>
<div className="pointer" /> <div className="pointer" />
</div> </div>

View File

@ -52,7 +52,7 @@ const useFurnitureExternalImageWidgetState = () =>
if(roomObjectPhotoData) if(roomObjectPhotoData)
{ {
index = datas.findIndex(data => (data.u === roomObjectPhotoData.u)) index = datas.findIndex(data => (data.w === roomObjectPhotoData.w))
} }
if(index < 0) index = 0; if(index < 0) index = 0;