add ability to enter html for public group chat

This commit is contained in:
PhilReact 2025-05-29 21:19:57 +03:00
parent cfa4afc506
commit 4ad0fb7db3
3 changed files with 54 additions and 42 deletions

View File

@ -39,6 +39,7 @@ import StarterKit from "@tiptap/starter-kit";
import Underline from "@tiptap/extension-underline";
import { generateHTML } from "@tiptap/react";
import ErrorBoundary from "../../common/ErrorBoundary";
import { isHtmlString } from "../../utils/chat";
const extractTextFromHTML = (htmlString = '') => {
return convert(htmlString, {
@ -62,24 +63,27 @@ export const ChatOptions = ({ messages : untransformedMessages, goToMessage, mem
const messages = useMemo(() => {
return untransformedMessages?.map((item) => {
if (item?.messageText) {
let transformedMessage = item?.messageText
let transformedMessage = item?.messageText;
const isHtml = isHtmlString(item?.messageText);
try {
transformedMessage = generateHTML(item?.messageText, [
transformedMessage = isHtml
? item?.messageText
: generateHTML(item?.messageText, [
StarterKit,
Underline,
Highlight,
Mention
])
Mention,
]);
return {
...item,
messageText: transformedMessage
}
messageText: transformedMessage,
};
} catch (error) {
// error
console.log(error);
}
} else return item
})
}, [untransformedMessages])
} else return item;
});
}, [untransformedMessages]);
const getTimestampMention = async () => {
try {

View File

@ -34,7 +34,7 @@ import level8Img from "../../assets/badges/level-8.png"
import level9Img from "../../assets/badges/level-9.png"
import level10Img from "../../assets/badges/level-10.png"
import { Embed } from "../Embeds/Embed";
import { buildImageEmbedLink, messageHasImage } from "../../utils/chat";
import { buildImageEmbedLink, isHtmlString, messageHasImage } from "../../utils/chat";
const getBadgeImg = (level)=> {
switch(level?.toString()){
@ -105,34 +105,32 @@ useEffect(()=> {
}, [message?.sender, getIndividualUserInfo])
const htmlText = useMemo(() => {
if (message?.messageText) {
const isHtml = isHtmlString(message?.messageText);
if (isHtml) return message?.messageText;
return generateHTML(message?.messageText, [
StarterKit,
Underline,
Highlight,
Mention,
TextStyle
])
TextStyle,
]);
}
}, [message?.editTimestamp])
}, [message?.editTimestamp]);
const htmlReply = useMemo(() => {
if (reply?.messageText) {
const isHtml = isHtmlString(reply?.messageText);
if (isHtml) return reply?.messageText;
return generateHTML(reply?.messageText, [
StarterKit,
Underline,
Highlight,
Mention,
TextStyle
])
TextStyle,
]);
}
}, [reply?.editTimestamp])
}, [reply?.editTimestamp]);
const userAvatarUrl = useMemo(()=> {
return message?.senderName ? `${getBaseApiReact()}/arbitrary/THUMBNAIL/${
@ -524,6 +522,18 @@ const onSeenFunc = useCallback(()=> {
export const ReplyPreview = ({message, isEdit})=> {
const replyMessageText = useMemo(() => {
const isHtml = isHtmlString(message?.messageText);
if (isHtml) return message?.messageText;
return generateHTML(message?.messageText, [
StarterKit,
Underline,
Highlight,
Mention,
TextStyle,
]);
}, [message?.messageText]);
return (
<Box
sx={{
@ -560,13 +570,7 @@ export const ReplyPreview = ({message, isEdit})=> {
{message?.messageText && (
<MessageDisplay
htmlContent={generateHTML(message?.messageText, [
StarterKit,
Underline,
Highlight,
Mention,
TextStyle
])}
htmlContent={replyMessageText}
/>
)}
{message?.decryptedData?.type === "notification" ? (

View File

@ -20,3 +20,7 @@ export const messageHasImage = (message) => {
message.images[0]?.service
);
};
export function isHtmlString(value) {
return typeof value === 'string' && /<[^>]+>/.test(value.trim());
}