diff --git a/src/app/components/event-readers/EventReaders.tsx b/src/app/components/event-readers/EventReaders.tsx index e4291e02..546f952d 100644 --- a/src/app/components/event-readers/EventReaders.tsx +++ b/src/app/components/event-readers/EventReaders.tsx @@ -24,6 +24,8 @@ import { useObservableValuePromise } from '../../hooks/useObservableValue'; import { useRoomMembersAPI } from '../../hooks/useRoomMembers'; import { mxcToHttp } from '../../../client/mxcToHttp'; import { useRoom } from '../../hooks/useRoom'; +import { Time } from '../message'; +import { useSettings } from '../../state/hooks/settings'; export type EventReadersProps = { eventId: string; @@ -34,6 +36,7 @@ export const EventReaders = as<'div', EventReadersProps>( const ct = useClient(); const roomId = useRoom(); const membersAPI = useRoomMembersAPI(); + const { hour24Clock, dateFormatString } = useSettings(); const eventReceipt = useObservableValuePromise( useMemo( @@ -42,14 +45,6 @@ export const EventReaders = as<'div', EventReadersProps>( ) ); - const users: string[] = useMemo(() => { - const u = new Set(); - eventReceipt.value?.forEach((r) => { - u.add(r.userId); - }); - return Array.from(u); - }, [eventReceipt]); - const useAuthentication = useMediaAuthentication(); const openProfile = useOpenUserRoomProfile(); const spaceId = useSpaceOptionally(); @@ -72,48 +67,58 @@ export const EventReaders = as<'div', EventReadersProps>( - {users.map((readerId) => { - const name = membersAPI.getName(readerId); - const avatarMxcUrl = membersAPI.getAvatar(readerId); - const avatarUrl = avatarMxcUrl - ? mxcToHttp(ct.session.baseUrl, avatarMxcUrl, useAuthentication).thumbnail({ - width: 96, - height: 96, - method: 'crop', - }) - : undefined; + {Array.from(eventReceipt.value ?? []) + .sort((a, b) => b.ts - a.ts) + ?.map((receipt) => { + const { userId, ts } = receipt; + const name = membersAPI.getName(userId); + const avatarMxcUrl = membersAPI.getAvatar(userId); + const avatarUrl = avatarMxcUrl + ? mxcToHttp(ct.session.baseUrl, avatarMxcUrl, useAuthentication).thumbnail({ + width: 96, + height: 96, + method: 'crop', + }) + : undefined; - return ( - { - openProfile( - roomId, - spaceId, - readerId, - getMouseEventCords(event.nativeEvent), - 'Bottom' - ); - }} - before={ - - } + return ( + { + openProfile( + roomId, + spaceId, + userId, + getMouseEventCords(event.nativeEvent), + 'Bottom' + ); + }} + before={ + + } + /> + + } + after={ + - } - > - - {name} - - - ); - })} + } + > + + {name} + + + ); + })}