From e59f23880bd1c4fa4355ffd54762120fe6bb7c97 Mon Sep 17 00:00:00 2001 From: Jaiwanth Date: Fri, 21 May 2021 20:25:29 +0530 Subject: [PATCH] Minor UI changes --- src/utils/exportUtils.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/utils/exportUtils.js b/src/utils/exportUtils.js index 433600eac4..0ab65df911 100644 --- a/src/utils/exportUtils.js +++ b/src/utils/exportUtils.js @@ -281,7 +281,7 @@ const getTimelineConversation = (room) => { cli, timelineSet, {windowLimit: Number.MAX_VALUE}); - timelineWindow.load(null, 20); + timelineWindow.load(null, 30); const events = timelineWindow.getEvents(); @@ -347,7 +347,7 @@ const getUserPic = async (event) => { }; //Gets the event_id of an event to which an event is replied -const baseEventId = (event) => { +const getBaseEventId = (event) => { const isEncrypted = event.isEncrypted(); // If encrypted, in_reply_to lies in event.event.content @@ -401,7 +401,7 @@ const createMessageBody = async (event, joined = false, isReply = false, replyId break; case "m.image": { messageBody = ` - + `; const blob = await getImageData(event); zip.file(`images/${event.getId()}.png`, blob); @@ -437,20 +437,21 @@ const createHTML = async (events, room) => { content += dateSeparator(event, prevEvent); if (event.getType() === "m.room.message") { - const replyTo = baseEventId(event); + const replyTo = getBaseEventId(event); const shouldBeJoined = prevEvent && prevEvent.getContent().msgtype === "m.text" && event.sender.userId === prevEvent.sender.userId && !dateSeparator(event, prevEvent) && !replyTo; const body = await createMessageBody(event, shouldBeJoined, !!replyTo, replyTo); content += body; } else { - content += ` + const eventText = textForEvent(event); + content += eventText ? `
${textForEvent(event)}
- `; + ` : ""; } prevEvent = event; }