refactor: send and message display

This commit is contained in:
zerosoul
2022-03-18 16:33:21 +08:00
parent 7bb8e9a914
commit 184f68b094
19 changed files with 353 additions and 157 deletions
+10 -2
View File
@@ -65,8 +65,10 @@ function Message({ contextId = 0, mid = "", read = true, context = "user" }) {
created_at: time,
sending,
content,
thumbnail,
content_type = "text/plain",
edited,
properties,
} = message;
const reactions = reactionMessageData[mid];
const currUser = contactsData[fromUid] || {};
@@ -89,12 +91,12 @@ function Message({ contextId = 0, mid = "", read = true, context = "user" }) {
</div>
</Tippy>
<div className="details">
{reply_mid && <Reply mid={reply_mid} />}
<div className="up">
<span className="name">{currUser.name}</span>
<i className="time">{dayjs(time).format("YYYY-MM-DD h:mm:ss A")}</i>
</div>
<div className={`down ${sending ? "sending" : ""}`}>
{reply_mid && <Reply mid={reply_mid} />}
{edit ? (
<EditMessage
content={content}
@@ -102,7 +104,13 @@ function Message({ contextId = 0, mid = "", read = true, context = "user" }) {
cancelEdit={toggleEditMessage}
/>
) : (
renderContent(content_type, content, edited)
renderContent({
content_type,
properties,
content,
thumbnail,
edited,
})
)}
{reactions && <Reaction mid={mid} reactions={reactions} />}
</div>