fix: forward avatar error

This commit is contained in:
zerosoul
2022-05-18 22:16:39 +08:00
parent 45e9e4ef6d
commit 8cd7e73942
3 changed files with 17 additions and 18 deletions
@@ -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(
<StyledForward data-forwarded-mids={forward_mids.join(",")}>
<h4 className="tip">
@@ -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!");
+12 -9
View File
@@ -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 {