Mirrors/gomuks
1
0
Fork 1
mirror of https://github.com/tulir/gomuks.git synced 2025-04-19 18:13:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

web/timeline: don't omit profile if there's a date separator

Browse source
This commit is contained in:
Tulir Asokan 2024-11-17 00:01:46 +02:00
parent 80f9a8bb6b
commit 2b10509ceb
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
web/src/ui/timeline/TimelineEvent.tsx
View file

@ -91,6 +91,18 @@ const TimelineEvent = ({ evt, prevEvt, disableMenu }: TimelineEventProps) => {
if (evt.type === "m.room.member") { if (evt.type === "m.room.member") {
wrapperClassNames.push("membership-event") wrapperClassNames.push("membership-event")
} }
let dateSeparator = null
const prevEvtDate = prevEvt ? new Date(prevEvt.timestamp) : null
if (prevEvtDate && (
eventTS.getDate() !== prevEvtDate.getDate() ||
eventTS.getMonth() !== prevEvtDate.getMonth() ||
eventTS.getFullYear() !== prevEvtDate.getFullYear())) {
dateSeparator = <div className="date-separator">
<hr role="none"/>
{dateFormatter.format(eventTS)}
<hr role="none"/>
</div>
}
let smallAvatar = false let smallAvatar = false
let renderAvatar = true let renderAvatar = true
let eventTimeOnly = false let eventTimeOnly = false
@ -100,7 +112,8 @@ const TimelineEvent = ({ evt, prevEvt, disableMenu }: TimelineEventProps) => {
eventTimeOnly = true eventTimeOnly = true
} else if (prevEvt?.sender === evt.sender && } else if (prevEvt?.sender === evt.sender &&
prevEvt.timestamp + 15 * 60 * 1000 > evt.timestamp && prevEvt.timestamp + 15 * 60 * 1000 > evt.timestamp &&
!isSmallEvent(getBodyType(prevEvt))) { !isSmallEvent(getBodyType(prevEvt)) &&
dateSeparator === null) {
wrapperClassNames.push("same-sender") wrapperClassNames.push("same-sender")
eventTimeOnly = true eventTimeOnly = true
renderAvatar = false renderAvatar = false
@ -156,18 +169,6 @@ const TimelineEvent = ({ evt, prevEvt, disableMenu }: TimelineEventProps) => {
</div> </div>
{evt.sender === client.userID && evt.transaction_id ? <EventSendStatus evt={evt}/> : null} {evt.sender === client.userID && evt.transaction_id ? <EventSendStatus evt={evt}/> : null}
</div> </div>
let dateSeparator = null
const prevEvtDate = prevEvt ? new Date(prevEvt.timestamp) : null
if (prevEvtDate && (
eventTS.getDate() !== prevEvtDate.getDate() ||
eventTS.getMonth() !== prevEvtDate.getMonth() ||
eventTS.getFullYear() !== prevEvtDate.getFullYear())) {
dateSeparator = <div className="date-separator">
<hr role="none"/>
{dateFormatter.format(eventTS)}
<hr role="none"/>
</div>
}
return <> return <>
{dateSeparator} {dateSeparator}
{mainEvent} {mainEvent}