|
|
|
@ -4,7 +4,8 @@ import { olog, isEmpty } from '@/utils/commons';
|
|
|
|
|
import { receivedMsgTypeMapped, handleNotification } from '@/channel/whatsappUtils';
|
|
|
|
|
import { fetchConversationsList, fetchTemplates, fetchConversationsSearch, UNREAD_MARK } from '@/actions/ConversationActions';
|
|
|
|
|
import { devtools } from 'zustand/middleware';
|
|
|
|
|
import { WS_URL } from '@/config';
|
|
|
|
|
import { WS_URL, DATETIME_FORMAT } from '@/config';
|
|
|
|
|
import dayjs from 'dayjs';
|
|
|
|
|
|
|
|
|
|
// const WS_URL = 'ws://202.103.68.144:8888/whatever/';
|
|
|
|
|
// const WS_URL = 'ws://120.79.9.217:10022/whatever/';
|
|
|
|
@ -277,7 +278,7 @@ const messageSlice = (set, get) => ({
|
|
|
|
|
// 更新列表的时间
|
|
|
|
|
conversationsList.splice(targetIndex, 1, {
|
|
|
|
|
...conversationsList[targetIndex],
|
|
|
|
|
last_received_time: message.status === 'received' ? message.deliverTime : conversationsList[targetIndex].last_received_time, // todo: 需要+8 hours
|
|
|
|
|
last_received_time: message.status === 'received' ? dayjs(message.deliverTime).add(8, 'hours').format(DATETIME_FORMAT) : conversationsList[targetIndex].last_received_time,
|
|
|
|
|
conversation_expiretime: message?.conversation?.expireTime || conversationsList[targetIndex].conversation_expiretime || '', // 保留使用UTC时间
|
|
|
|
|
});
|
|
|
|
|
} else if (targetIndex === -1) {
|
|
|
|
@ -307,7 +308,7 @@ const messageSlice = (set, get) => ({
|
|
|
|
|
const { activeConversations, conversationsList, currentConversation, totalNotify } = get();
|
|
|
|
|
const targetMsgs = activeConversations[String(targetId)] || [];
|
|
|
|
|
const targetIndex = conversationsList.findIndex((ele) => String(ele.sn) === String(targetId));
|
|
|
|
|
const lastReceivedTime = message.type !== 'system' && message.sender !== 'me' ? message.date : null;
|
|
|
|
|
const lastReceivedTime = (message.type !== 'system' && message.sender !== 'me') ? dayjs(message.date).add(8, 'hours').format(DATETIME_FORMAT) : null;
|
|
|
|
|
const newConversation =
|
|
|
|
|
targetIndex !== -1
|
|
|
|
|
? {
|
|
|
|
@ -323,7 +324,7 @@ const messageSlice = (set, get) => ({
|
|
|
|
|
...message,
|
|
|
|
|
sn: targetId,
|
|
|
|
|
opi_sn: currentConversation.opi_sn, // todo: coli sn
|
|
|
|
|
last_received_time: message.date,
|
|
|
|
|
last_received_time: dayjs(message.date).add(8, 'hours').format(DATETIME_FORMAT),
|
|
|
|
|
unread_msg_count: message.sender === 'me' ? 0 : 1,
|
|
|
|
|
whatsapp_name: message?.senderName || message?.sender || '',
|
|
|
|
|
customer_name: message?.senderName || message?.sender || '',
|
|
|
|
|