diff --git a/src/common/component/Message/ForwardedMessage.js b/src/common/component/Message/ForwardedMessage.js index 36784275..73bc87e9 100644 --- a/src/common/component/Message/ForwardedMessage.js +++ b/src/common/component/Message/ForwardedMessage.js @@ -40,7 +40,7 @@ const ForwardedMessage = ({ context, to, from_uid, id }) => { useEffect(() => { if (messages) { const forward_mids = messages.map(({ from_mid }) => from_mid) || []; - + console.log("fff", messages); setForwards(

diff --git a/src/common/component/Message/useMessageOperation.js b/src/common/component/Message/useMessageOperation.js index 531c3355..0a4af20b 100644 --- a/src/common/component/Message/useMessageOperation.js +++ b/src/common/component/Message/useMessageOperation.js @@ -1,6 +1,5 @@ import { useState, useEffect } from "react"; import toast from "react-hot-toast"; -import { copyImageToClipboard } from "copy-image-clipboard"; import DeleteMessageConfirm from "../DeleteMessageConfirm"; import ForwardModal from "../ForwardModal"; import PinMessageModal from "./PinMessageModal"; @@ -43,26 +42,23 @@ export default function useMessageOperation({ mid, context, contextId }) { setPinModalVisible((prev) => !prev); }; const copyContent = (image = false) => { - if (image) { - copyImageToClipboard(content); - } else { - copy(content); - } + copy(content, image); }; useEffect(() => { - if (content_type == ContentTypes.archive) { + if (forwardModalVisible && content_type == ContentTypes.archive) { // forward message const forwardEle = document.querySelector( `[data-msg-mid='${mid}'] .down [data-forwarded-mids]` ); if (forwardEle) { + console.log("ddddd", mid, forwardEle.dataset); const mids = forwardEle.dataset.forwardedMids.split(","); setMids(mids); } } else { setMids([mid]); } - }, [mid, content_type]); + }, [mid, forwardModalVisible, content_type]); useEffect(() => { if (isUnpinSuccess) { toast.success("Unpin Message Successfully!"); diff --git a/src/common/utils.js b/src/common/utils.js index db9de4dc..8e43373e 100644 --- a/src/common/utils.js +++ b/src/common/utils.js @@ -226,16 +226,19 @@ export const normalizeArchiveData = ( from_user, }) => { let user = { ...(users[from_user] || {}) }; - const { transformedContent, thumbnail, download, avatar } = getUrls(uid, { - content, - content_type, - filePath, - file_id, - thumbnail_id, - avatar: user.avatar, - }); + const { transformedContent, thumbnail, download, avatarUrl } = getUrls( + uid, + { + content, + content_type, + filePath, + file_id, + thumbnail_id, + avatar: user.avatar, + } + ); - user.avatar = avatar; + user.avatar = avatarUrl; console.log("user data", transformedContent, user); return {