major: change message logic and breaks oldticket

This commit is contained in:
canove
2020-07-30 14:09:05 -03:00
parent ee6c742a8d
commit 56afe86805
8 changed files with 106 additions and 75 deletions

View File

@@ -105,7 +105,7 @@ const useStyles = makeStyles(theme => ({
const MessageInput = ({ searchParam }) => {
const classes = useStyles();
const { ticketId } = useParams();
const userId = localStorage.getItem("userId");
// const userId = localStorage.getItem("userId");
const username = localStorage.getItem("username");
const mediaInitialState = { preview: "", raw: "", name: "" };
@@ -157,7 +157,7 @@ const MessageInput = ({ searchParam }) => {
e.preventDefault();
const formData = new FormData();
formData.append("media", media.raw);
formData.append("userId", userId);
formData.append("fromMe", true);
formData.append("body", media.name);
try {
@@ -175,7 +175,7 @@ const MessageInput = ({ searchParam }) => {
setLoading(true);
const message = {
read: 1,
userId: userId,
fromMe: true,
mediaUrl: "",
body: `${username}: ${inputMessage.trim()}`,
};
@@ -220,7 +220,7 @@ const MessageInput = ({ searchParam }) => {
console.log(blob);
formData.append("media", blob, filename);
formData.append("body", filename);
formData.append("userId", userId);
formData.append("fromMe", true);
try {
await api.post(`/messages/${ticketId}`, formData);
} catch (err) {

View File

@@ -441,7 +441,7 @@ const MessagesList = () => {
const renderMessages = () => {
if (messagesList.length > 0) {
const viewMessagesList = messagesList.map((message, index) => {
if (!message.userId) {
if (!message.fromMe) {
return (
<LinkifyWithTargetBlank key={message.id}>
{renderDailyTimestamps(message, index)}

View File

@@ -259,7 +259,7 @@ const TicketsList = () => {
});
socket.on("appMessage", data => {
if (data.action === "create") {
if (data.action === "create" && !data.message.fromMe) {
updateUnreadMessagesCount(data);
if (
(ticketId &&