Fix Message Parsing Issues #82
@@ -110,14 +110,17 @@ const generateColor = (user_str) => {
|
||||
* @props {JSON} chatObj - Chat Object
|
||||
* @returns {Object} - Chat Message Component
|
||||
*/
|
||||
export function Chat({ chatObj }) {
|
||||
export function Chat({ chatObj, user }) {
|
||||
function deleteMessage() {
|
||||
remove(ref(database, `/rooms/${path}/chats/${chatObj.timestamp}-${chatObj.user}`))
|
||||
}
|
||||
|
||||
if (chatObj.body) {
|
||||
var messageFilterBypass = [undefined, null, '', ' ', '\'', '\"']
|
||||
if (!messageFilterBypass.includes(chatObj.body) && (chatObj.body.length != 1 && !chatObj.body[0].match(/\W/))) {
|
||||
console.log(chatObj.body)
|
||||
var message = filter.clean(chatObj.body)
|
||||
message = RMF(message)
|
||||
} else {
|
||||
var message = chatObj.body
|
||||
}
|
||||
return (
|
||||
<div className="width-[100%] bg-white rounded-lg mt-1 text-left p-1 grid grid-cols-2 mr-2">
|
||||
|
||||
@@ -50,21 +50,24 @@ export function DMRoom({ roomObj, user }) {
|
||||
* @returns {void}
|
||||
*/
|
||||
function sendMessage(data) {
|
||||
var messageFilterBypass = [undefined, null, "", " ", ' ', '\'']
|
||||
reset();
|
||||
var payload = {
|
||||
body: data.message,
|
||||
user: user.username,
|
||||
uid: user.uid,
|
||||
isSystem: false,
|
||||
timestamp: new Date().getTime(),
|
||||
};
|
||||
set(
|
||||
ref(
|
||||
database,
|
||||
`/dms/${roomObj.room}/chats/${new Date().getTime()}-${user.username}`
|
||||
),
|
||||
payload
|
||||
);
|
||||
if (!messageFilterBypass.includes(data.message)) {
|
||||
var payload = {
|
||||
body: data.message,
|
||||
user: user.username,
|
||||
uid: user.uid,
|
||||
isSystem: false,
|
||||
timestamp: new Date().getTime(),
|
||||
};
|
||||
set(
|
||||
ref(
|
||||
database,
|
||||
`/dms/${roomObj.room}/chats/${new Date().getTime()}-${user.username}`
|
||||
),
|
||||
payload
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (!chats) return <div>No Chats</div>;
|
||||
|
||||
@@ -50,7 +50,8 @@ export function ChatRoom({ roomObj, user }) {
|
||||
* @returns {void}
|
||||
*/
|
||||
function sendMessage(data) {
|
||||
if (data.message) {
|
||||
var messageFilterBypass = [undefined, null, '', ' ', '\'', '\"']
|
||||
if (!messageFilterBypass.includes(data.message)) {
|
||||
reset();
|
||||
var payload = {
|
||||
body: data.message,
|
||||
|
||||
Reference in New Issue
Block a user