Compare commits
5
Commits
72c71bc789
...
76e5f960d1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
76e5f960d1 | ||
|
|
bd649d4e16 | ||
|
|
2639982d5b | ||
|
|
95d1cb9630 | ||
|
|
fabbbc40af |
@@ -104,6 +104,7 @@ import {
|
||||
VideoOff,
|
||||
Volume2,
|
||||
VolumeX,
|
||||
WrapText,
|
||||
X,
|
||||
} from 'lucide-react';
|
||||
|
||||
@@ -233,6 +234,7 @@ export const Icons = {
|
||||
Vlc: Play,
|
||||
VolumeHigh: Volume2,
|
||||
VolumeMute: VolumeX,
|
||||
WrapText,
|
||||
Warning: TriangleAlert,
|
||||
ImagePlay,
|
||||
} as const;
|
||||
|
||||
@@ -6,8 +6,8 @@ export const RoomInputWrap = style({
|
||||
width: '100%',
|
||||
});
|
||||
|
||||
/* Notebook-flat composer chrome — Stationery only (other themes keep Editor inset border) */
|
||||
globalStyle(`.stationery ${RoomInputWrap} .${editorCss.Editor}`, {
|
||||
/* Notebook-flat composer chrome — all themes */
|
||||
globalStyle(`${RoomInputWrap} .${editorCss.Editor}`, {
|
||||
borderRadius: 0,
|
||||
boxShadow: 'none',
|
||||
borderTop: `${config.borderWidth.B300} solid ${color.SurfaceVariant.ContainerLine}`,
|
||||
|
||||
@@ -100,7 +100,7 @@ import colorMXID from '../../../util/colorMXID';
|
||||
import { useIsDirectRoom } from '../../hooks/useRoom';
|
||||
import { useAccessiblePowerTagColors, useGetMemberPowerTag } from '../../hooks/useMemberPowerTag';
|
||||
import { useRoomCreators } from '../../hooks/useRoomCreators';
|
||||
import { isStationeryTheme, useTheme } from '../../hooks/useTheme';
|
||||
import { useTheme } from '../../hooks/useTheme';
|
||||
import { useRoomCreatorsTag } from '../../hooks/useRoomCreatorsTag';
|
||||
import { usePowerLevelTags } from '../../hooks/usePowerLevelTags';
|
||||
import { useComposingCheck } from '../../hooks/useComposingCheck';
|
||||
@@ -694,9 +694,9 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
|
||||
backgroundColor: color.SurfaceVariant.Container,
|
||||
border: `${config.borderWidth.B300} solid ${color.SurfaceVariant.ContainerLine}`,
|
||||
borderBottom: 'none',
|
||||
borderRadius: isStationeryTheme(theme) ? 0 : undefined,
|
||||
borderTopLeftRadius: isStationeryTheme(theme) ? undefined : config.radii.R400,
|
||||
borderTopRightRadius: isStationeryTheme(theme) ? undefined : config.radii.R400,
|
||||
borderRadius: 0,
|
||||
borderTopLeftRadius: 0,
|
||||
borderTopRightRadius: 0,
|
||||
marginBottom: config.space.S100,
|
||||
}}
|
||||
direction="Column"
|
||||
|
||||
@@ -11,6 +11,7 @@ import * as css from './RoomViewFollowing.css';
|
||||
import { useMatrixClient } from '../../hooks/useMatrixClient';
|
||||
import { useRoomLatestRenderedEvent } from '../../hooks/useRoomLatestRenderedEvent';
|
||||
import { useRoomEventReaders } from '../../hooks/useRoomEventReaders';
|
||||
import { useRoomEventDelivery } from '../../hooks/useRoomEventDelivery';
|
||||
import { EventReaders } from '../../components/event-readers';
|
||||
import { stopPropagation } from '../../utils/keyboard';
|
||||
|
||||
@@ -24,16 +25,23 @@ export type RoomViewFollowingProps = {
|
||||
export const RoomViewFollowing = as<'div', RoomViewFollowingProps>(
|
||||
({ className, room, ...props }, ref) => {
|
||||
const mx = useMatrixClient();
|
||||
const myUserId = mx.getUserId();
|
||||
const [open, setOpen] = useState(false);
|
||||
const latestEvent = useRoomLatestRenderedEvent(room);
|
||||
const latestEventReaders = useRoomEventReaders(room, latestEvent?.getId());
|
||||
const names = latestEventReaders
|
||||
.filter((readerId) => readerId !== mx.getUserId())
|
||||
.map(
|
||||
(readerId) => getMemberDisplayName(room, readerId) ?? getMxIdLocalPart(readerId) ?? readerId
|
||||
);
|
||||
|
||||
const eventId = latestEvent?.getId();
|
||||
const latestEventReaders = useRoomEventReaders(room, eventId);
|
||||
const received = useRoomEventDelivery(room, eventId, myUserId);
|
||||
|
||||
// Received but not read shows a single tick, read shows the double tick.
|
||||
const receivedOnly = received && !latestEventReaders.includes(myUserId);
|
||||
|
||||
const getName = (userId: string) =>
|
||||
getMemberDisplayName(room, userId) ?? getMxIdLocalPart(userId) ?? userId;
|
||||
|
||||
const names = [
|
||||
...(receivedOnly && myUserId ? [myUserId] : []),
|
||||
...latestEventReaders.filter((readerId) => readerId !== myUserId),
|
||||
].map(getName);
|
||||
|
||||
if (names.length === 0) {
|
||||
return null;
|
||||
@@ -69,7 +77,11 @@ export const RoomViewFollowing = as<'div', RoomViewFollowingProps>(
|
||||
{...props}
|
||||
ref={ref}
|
||||
>
|
||||
<Icon style={{ opacity: config.opacity.P300 }} size="100" src={Icons.CheckTwice} />
|
||||
<Icon
|
||||
style={{ opacity: config.opacity.P300 }}
|
||||
size="100"
|
||||
src={receivedOnly ? Icons.Check : Icons.CheckTwice}
|
||||
/>
|
||||
<Text size="T300" truncate>
|
||||
{names.length === 1 && <b>{names[0]}</b>}
|
||||
{names.length === 2 && (
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { MatrixEvent, Room, RoomEvent } from 'matrix-js-sdk';
|
||||
import { PAARROT_RECEIVED_EVENT, hasReceivedMarker } from '../utils/paarrotDelivery';
|
||||
|
||||
/**
|
||||
* Whether `userId` has recorded a delivery marker for `eventId` - received, but
|
||||
* not necessarily read. Read state still comes from the read receipt.
|
||||
*/
|
||||
export const useRoomEventDelivery = (room: Room, eventId?: string, userId?: string): boolean => {
|
||||
const [received, setReceived] = useState(() =>
|
||||
eventId && userId ? hasReceivedMarker(room, eventId, userId) : false,
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
setReceived(eventId && userId ? hasReceivedMarker(room, eventId, userId) : false);
|
||||
if (!eventId || !userId) return;
|
||||
|
||||
const update = () => setReceived(hasReceivedMarker(room, eventId, userId));
|
||||
|
||||
const handleTimeline = (event: MatrixEvent, r: Room) => {
|
||||
if (r.roomId !== room.roomId) return;
|
||||
if (event.getRelation()?.event_id !== eventId) return;
|
||||
if (event.getType() !== PAARROT_RECEIVED_EVENT && !event.isRedaction()) return;
|
||||
|
||||
update();
|
||||
};
|
||||
|
||||
room.on(RoomEvent.Timeline, handleTimeline);
|
||||
return () => {
|
||||
room.removeListener(RoomEvent.Timeline, handleTimeline);
|
||||
};
|
||||
}, [room, eventId, userId]);
|
||||
|
||||
return received;
|
||||
};
|
||||
@@ -0,0 +1,49 @@
|
||||
import { keyframes, style } from '@vanilla-extract/css';
|
||||
import { config, DefaultReset, toRem } from 'folds';
|
||||
|
||||
const particleRise = keyframes({
|
||||
'0%': {
|
||||
opacity: 0,
|
||||
transform: 'translateY(24px) scale(0.85)',
|
||||
},
|
||||
'100%': {
|
||||
opacity: 1,
|
||||
transform: 'translateY(0) scale(1)',
|
||||
},
|
||||
});
|
||||
|
||||
export const SplashSpaces = style([
|
||||
DefaultReset,
|
||||
{
|
||||
display: 'flex',
|
||||
flexWrap: 'wrap',
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
gap: config.space.S300,
|
||||
maxWidth: toRem(420),
|
||||
},
|
||||
]);
|
||||
|
||||
export const SplashSpace = style({
|
||||
animation: `${particleRise} 450ms cubic-bezier(0.16, 1, 0.3, 1) both`,
|
||||
});
|
||||
|
||||
export const SplashSpaceImage = style({
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
borderRadius: 'inherit',
|
||||
});
|
||||
|
||||
export const SplashStatus = style({
|
||||
animation: `${particleRise} 450ms cubic-bezier(0.16, 1, 0.3, 1) both`,
|
||||
});
|
||||
|
||||
export const SplashSpaceFallback = style({
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
borderRadius: 'inherit',
|
||||
textTransform: 'capitalize',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
});
|
||||
@@ -0,0 +1,128 @@
|
||||
import { Avatar, AvatarFallback, AvatarImage, Box, Spinner, Text, color } from 'folds';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { ClientEvent, MatrixClient, Room } from 'matrix-js-sdk';
|
||||
import { SplashScreen } from '../../components/splash-screen';
|
||||
import { getAccountData, getMDirects, getRoomAvatarUrl, isSpace } from '../../utils/room';
|
||||
import { AccountDataEvent } from '../../../types/matrix/accountData';
|
||||
import { nameInitials } from '../../utils/common';
|
||||
import colorMXID from '../../../util/colorMXID';
|
||||
import * as css from './ClientLoading.css';
|
||||
|
||||
type CachedChats = {
|
||||
spaces: Room[];
|
||||
directs: number;
|
||||
};
|
||||
|
||||
const getSnapshot = (mx: MatrixClient): CachedChats => {
|
||||
const rooms = mx.getRooms();
|
||||
const mDirectEvent = getAccountData(mx, AccountDataEvent.Direct);
|
||||
const directs = mDirectEvent ? getMDirects(mDirectEvent) : new Set<string>();
|
||||
|
||||
return {
|
||||
spaces: rooms
|
||||
.filter((room) => isSpace(room) && room.getMyMembership() === 'join')
|
||||
.sort((a, b) => (a.name ?? '').localeCompare(b.name ?? '')),
|
||||
directs: rooms.filter((room) => directs.has(room.roomId)).length,
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
* Cached rooms are restored asynchronously from the IndexedDB store, so poll
|
||||
* while connecting to show the user's spaces as soon as they become available.
|
||||
*/
|
||||
function useCachedChats(mx?: MatrixClient): CachedChats {
|
||||
const [snapshot, setSnapshot] = useState<CachedChats>(() =>
|
||||
mx ? getSnapshot(mx) : { spaces: [], directs: 0 },
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
if (!mx) return undefined;
|
||||
|
||||
const update = () => setSnapshot(getSnapshot(mx));
|
||||
update();
|
||||
|
||||
const timer = setInterval(update, 400);
|
||||
mx.on(ClientEvent.Room, update);
|
||||
mx.on(ClientEvent.AccountData, update);
|
||||
|
||||
return () => {
|
||||
clearInterval(timer);
|
||||
mx.removeListener(ClientEvent.Room, update);
|
||||
mx.removeListener(ClientEvent.AccountData, update);
|
||||
};
|
||||
}, [mx]);
|
||||
|
||||
return snapshot;
|
||||
}
|
||||
|
||||
function SplashSpaceAvatar({ mx, room, index }: { mx: MatrixClient; room: Room; index: number }) {
|
||||
// Authenticated media needs the full client context, which is not available
|
||||
// while loading; fall back to initials when the plain URL fails.
|
||||
const src = getRoomAvatarUrl(mx, room, 96);
|
||||
const [error, setError] = useState(false);
|
||||
|
||||
return (
|
||||
<Avatar
|
||||
size="300"
|
||||
radii="400"
|
||||
className={css.SplashSpace}
|
||||
style={{ animationDelay: `${Math.min(index * 80, 640)}ms` }}
|
||||
>
|
||||
{src && !error ? (
|
||||
<AvatarImage
|
||||
className={css.SplashSpaceImage}
|
||||
src={src}
|
||||
alt={room.name}
|
||||
onError={() => setError(true)}
|
||||
draggable={false}
|
||||
/>
|
||||
) : (
|
||||
<AvatarFallback
|
||||
className={css.SplashSpaceFallback}
|
||||
style={{ backgroundColor: colorMXID(room.roomId), color: color.Surface.Container }}
|
||||
>
|
||||
<Text size="H6">{nameInitials(room.name, 2)}</Text>
|
||||
</AvatarFallback>
|
||||
)}
|
||||
</Avatar>
|
||||
);
|
||||
}
|
||||
|
||||
const foundLine = (spaces: number, directs: number): string => {
|
||||
const parts = [];
|
||||
if (spaces > 0) parts.push(`Found ${spaces} ${spaces === 1 ? 'space' : 'spaces'}`);
|
||||
if (directs > 0) parts.push(`${directs} ${directs === 1 ? 'chat' : 'chats'}`);
|
||||
return parts.join(' · ');
|
||||
};
|
||||
|
||||
export function ClientLoading({ mx }: { mx?: MatrixClient }) {
|
||||
const { spaces, directs } = useCachedChats(mx);
|
||||
|
||||
return (
|
||||
<SplashScreen>
|
||||
<Box direction="Column" grow="Yes" alignItems="Center" justifyContent="Center" gap="400">
|
||||
<Spinner variant="Secondary" size="600" />
|
||||
<Text>Heating up</Text>
|
||||
{mx && (spaces.length > 0 || directs > 0) && (
|
||||
<>
|
||||
{spaces.length > 0 && (
|
||||
<Box className={css.SplashSpaces}>
|
||||
{spaces.map((space, index) => (
|
||||
<SplashSpaceAvatar key={space.roomId} mx={mx} room={space} index={index} />
|
||||
))}
|
||||
</Box>
|
||||
)}
|
||||
<Text
|
||||
size="T300"
|
||||
align="Center"
|
||||
className={css.SplashStatus}
|
||||
style={{ animationDelay: `${Math.min(spaces.length * 80, 640) + 120}ms` }}
|
||||
>
|
||||
{foundLine(spaces.length, directs)}
|
||||
</Text>
|
||||
</>
|
||||
)}
|
||||
</Box>
|
||||
</SplashScreen>
|
||||
);
|
||||
}
|
||||
@@ -22,6 +22,7 @@ import {
|
||||
getOrphanParents,
|
||||
guessPerfectParent,
|
||||
} from '../../utils/room';
|
||||
import { sendReceivedMarker } from '../../utils/paarrotDelivery';
|
||||
import { NotificationType, UnreadInfo } from '../../../types/matrix/room';
|
||||
import { getMxIdLocalPart, mxcUrlToHttp, getCanonicalAliasOrRoomId } from '../../utils/matrix';
|
||||
import { mDirectAtom } from '../../state/mDirectList';
|
||||
@@ -387,6 +388,14 @@ function MessageNotifications() {
|
||||
(notificationType === NotificationType.Default && !isDm);
|
||||
if (mentionsOnly && unreadInfo.highlight === 0) return;
|
||||
|
||||
// Record that Paarrot received this message. This is the single tick; the
|
||||
// read receipt below is what turns it into the double tick.
|
||||
if (showNotifications) {
|
||||
sendReceivedMarker(mx, room, eventId).catch((error) => {
|
||||
console.error('[PaarrotDelivery] Failed to send delivery marker:', error);
|
||||
});
|
||||
}
|
||||
|
||||
if (
|
||||
showNotifications &&
|
||||
((isTauri() && !isElectron()) || isCapacitorNative() || notificationPermission('granted'))
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
import { Box, Button, config, Dialog, IconButton, Menu, MenuItem, PopOut, RectCords, Spinner, Text } from 'folds';
|
||||
import { Box, Button, config, Dialog, IconButton, Menu, MenuItem, PopOut, RectCords, Text } from 'folds';
|
||||
import { Icon, Icons } from '../../components/icons';
|
||||
import { HttpApiEvent, HttpApiEventHandlerMap, MatrixClient, SyncState } from 'matrix-js-sdk';
|
||||
import {
|
||||
ClientEvent,
|
||||
HttpApiEvent,
|
||||
HttpApiEventHandlerMap,
|
||||
MatrixClient,
|
||||
SyncState,
|
||||
} from 'matrix-js-sdk';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import React, { MouseEventHandler, ReactNode, useCallback, useEffect, useRef, useState } from 'react';
|
||||
import {
|
||||
@@ -11,6 +17,7 @@ import {
|
||||
startClient,
|
||||
} from '../../../client/initMatrix';
|
||||
import { SplashScreen } from '../../components/splash-screen';
|
||||
import { ClientLoading } from './ClientLoading';
|
||||
import { ServerConfigsLoader } from '../../components/ServerConfigsLoader';
|
||||
import { CapabilitiesProvider } from '../../hooks/useCapabilities';
|
||||
import { MediaConfigProvider } from '../../hooks/useMediaConfig';
|
||||
@@ -20,6 +27,10 @@ import { SpecVersions } from './SpecVersions';
|
||||
import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
|
||||
import { useSyncState } from '../../hooks/useSyncState';
|
||||
import { stopPropagation } from '../../utils/keyboard';
|
||||
import { useAtomValue } from 'jotai';
|
||||
import { allRoomsAtom, useBindAllRoomsAtom } from '../../state/room-list/roomList';
|
||||
import { mDirectAtom, useBindMDirectAtom } from '../../state/mDirectList';
|
||||
import { roomToParentsAtom, useBindRoomToParentsAtom } from '../../state/room/roomToParents';
|
||||
import { AuthMetadataProvider } from '../../hooks/useAuthMetadata';
|
||||
import { getCurrentSession } from '../../state/sessions';
|
||||
import { CallProviderWrapper } from '../../features/call/CallProviderWrapper';
|
||||
@@ -29,17 +40,6 @@ import { AccountSwitcher } from '../../components/account-switcher';
|
||||
import { getLoginPath, withSearchParam } from '../pathUtils';
|
||||
import { useViewTransitions } from '../../hooks/useViewTransitions';
|
||||
|
||||
function ClientRootLoading() {
|
||||
return (
|
||||
<SplashScreen>
|
||||
<Box direction="Column" grow="Yes" alignItems="Center" justifyContent="Center" gap="400">
|
||||
<Spinner variant="Secondary" size="600" />
|
||||
<Text>Heating up</Text>
|
||||
</Box>
|
||||
</SplashScreen>
|
||||
);
|
||||
}
|
||||
|
||||
const useLogoutListener = (mx?: MatrixClient) => {
|
||||
useEffect(() => {
|
||||
const handleLogout: HttpApiEventHandlerMap[HttpApiEvent.SessionLoggedOut] = async () => {
|
||||
@@ -140,6 +140,21 @@ const useBackgroundSync = (mx?: MatrixClient) => {
|
||||
}, [mx]);
|
||||
};
|
||||
|
||||
/**
|
||||
* Binds the atoms the chat UI reads while the splash is still up. Without this,
|
||||
* they are only bound after the splash hides, so the first paint shows the empty
|
||||
* state ("No Direct Messages") for a moment.
|
||||
*
|
||||
* Only the context-free bindings go here: the rest (unread, typing, auto-join)
|
||||
* needs the RoomsNotificationPreferences provider, which lives inside children.
|
||||
*/
|
||||
function ClientAtomBinder({ mx }: { mx: MatrixClient }) {
|
||||
useBindMDirectAtom(mx, mDirectAtom);
|
||||
useBindAllRoomsAtom(mx, allRoomsAtom);
|
||||
useBindRoomToParentsAtom(mx, roomToParentsAtom);
|
||||
return null;
|
||||
}
|
||||
|
||||
type ClientRootProps = {
|
||||
children: ReactNode;
|
||||
};
|
||||
@@ -148,6 +163,49 @@ export function ClientRoot({ children }: ClientRootProps) {
|
||||
const [loading, setLoading] = useState(true);
|
||||
const mxRef = useRef<MatrixClient | undefined>(undefined);
|
||||
const recoverInFlight = useRef(false);
|
||||
// Hold the splash briefly after chats are loaded so the space particles
|
||||
// finish animating before the UI swaps in.
|
||||
const splashHoldTimer = useRef<number | undefined>(undefined);
|
||||
// Grace window for the first network sync to land after the cache is ready;
|
||||
// hide anyway if we are offline so the UI is never blocked.
|
||||
const firstNetworkSyncGrace = useRef<number | undefined>(undefined);
|
||||
// Hard deadline so a sync that never lands (offline, empty store, errored
|
||||
// first sync) can not leave the splash up forever.
|
||||
const splashDeadline = useRef<number | undefined>(undefined);
|
||||
|
||||
const scheduleHide = useCallback((reason?: string) => {
|
||||
if (splashHoldTimer.current !== undefined) return;
|
||||
|
||||
if (reason) console.log(`[ClientRoot] Hiding splash: ${reason}`);
|
||||
splashHoldTimer.current = window.setTimeout(() => {
|
||||
splashHoldTimer.current = undefined;
|
||||
setLoading(false);
|
||||
}, 1500);
|
||||
}, []);
|
||||
|
||||
// The UI renders chats from the room-list atoms, which are filled by
|
||||
// ClientAtomBinder while the splash is still up. Gate the hide on those atoms
|
||||
// so the first paint after the splash already contains the chats.
|
||||
const roomsAtom = useAtomValue(allRoomsAtom);
|
||||
const directsAtom = useAtomValue(mDirectAtom);
|
||||
const chatsReady =
|
||||
roomsAtom.length > 0 && directsAtom.size > 0 && roomsAtom.some((roomId) => directsAtom.has(roomId));
|
||||
|
||||
const tryHide = useCallback(
|
||||
(reason: string): boolean => {
|
||||
if (chatsReady) {
|
||||
scheduleHide(reason);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
[chatsReady, scheduleHide]
|
||||
);
|
||||
|
||||
// The atoms fill in as the store restores the cache; hide as soon as they do.
|
||||
useEffect(() => {
|
||||
if (loading && chatsReady) scheduleHide('chats populated');
|
||||
}, [loading, chatsReady, scheduleHide]);
|
||||
const { baseUrl } = getCurrentSession() ?? {};
|
||||
|
||||
// Enable view transitions for smooth navigation
|
||||
@@ -168,6 +226,20 @@ export function ClientRoot({ children }: ClientRootProps) {
|
||||
mxRef.current = mx;
|
||||
}, [mx]);
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
if (splashHoldTimer.current !== undefined) {
|
||||
window.clearTimeout(splashHoldTimer.current);
|
||||
}
|
||||
if (firstNetworkSyncGrace.current !== undefined) {
|
||||
window.clearTimeout(firstNetworkSyncGrace.current);
|
||||
}
|
||||
if (splashDeadline.current !== undefined) {
|
||||
window.clearTimeout(splashDeadline.current);
|
||||
}
|
||||
};
|
||||
}, []);
|
||||
|
||||
const [startState, startMatrix] = useAsyncCallback<void, Error, [MatrixClient]>(
|
||||
useCallback((m) => startClient(m), [])
|
||||
);
|
||||
@@ -188,6 +260,45 @@ export function ClientRoot({ children }: ClientRootProps) {
|
||||
}
|
||||
}, [mx, startMatrix]);
|
||||
|
||||
// Cached rooms and m.direct land asynchronously from the IndexedDB store, so
|
||||
// watch for them while loading and hide as soon as the chats are populated.
|
||||
useEffect(() => {
|
||||
if (!mx || !loading) return undefined;
|
||||
|
||||
const check = () => tryHide('chats populated');
|
||||
|
||||
check();
|
||||
|
||||
console.log(
|
||||
'[ClientRoot] Splash gate:',
|
||||
mx.getSyncState(),
|
||||
`${roomsAtom.length} rooms in atom`,
|
||||
`${directsAtom.size} m.direct`
|
||||
);
|
||||
|
||||
// Prepared can fire before this listener attaches, so look at the current
|
||||
// state too, and never let the splash outlive the deadline.
|
||||
const syncState = mx.getSyncState();
|
||||
if (syncState === SyncState.Prepared || syncState === SyncState.Syncing) check();
|
||||
|
||||
if (splashDeadline.current === undefined) {
|
||||
splashDeadline.current = window.setTimeout(() => {
|
||||
splashDeadline.current = undefined;
|
||||
scheduleHide('deadline reached, showing whatever the cache has');
|
||||
}, 10000);
|
||||
}
|
||||
|
||||
const poll = window.setInterval(check, 400);
|
||||
mx.on(ClientEvent.Room, check);
|
||||
mx.on(ClientEvent.AccountData, check);
|
||||
|
||||
return () => {
|
||||
window.clearInterval(poll);
|
||||
mx.removeListener(ClientEvent.Room, check);
|
||||
mx.removeListener(ClientEvent.AccountData, check);
|
||||
};
|
||||
}, [mx, loading, chatsReady, tryHide, scheduleHide, roomsAtom, directsAtom]);
|
||||
|
||||
// Timeout if sync takes too long - nudge the client rather than immediately erroring
|
||||
useEffect(() => {
|
||||
if (!mx || !loading) return;
|
||||
@@ -200,19 +311,54 @@ export function ClientRoot({ children }: ClientRootProps) {
|
||||
return () => clearTimeout(timeout);
|
||||
}, [mx, loading]);
|
||||
|
||||
// Soft-recover from sync ERROR (e.g. sleep/wake with no network).
|
||||
// Never block the UI — SyncStatus / title bar already show "Connection Lost".
|
||||
// Hold the splash until the chats are actually populated, then keep it a
|
||||
// moment longer so the space particles finish animating.
|
||||
// Soft-recover from sync ERROR (e.g. sleep/wake with no network); the grace
|
||||
// window ensures we never block the UI when offline.
|
||||
useSyncState(
|
||||
mx,
|
||||
useCallback((state) => {
|
||||
useCallback((state, prevState, data) => {
|
||||
const client = mxRef.current;
|
||||
if (state === SyncState.Prepared || state === SyncState.Syncing) {
|
||||
setLoading(false);
|
||||
if (state === SyncState.Prepared) {
|
||||
console.log(
|
||||
'[ClientRoot] Prepared from',
|
||||
prevState ?? 'nothing',
|
||||
data?.fromCache ? '(cache)' : '(network)'
|
||||
);
|
||||
}
|
||||
|
||||
if (tryHide(data?.fromCache ? 'cache populated' : 'first network sync')) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (data?.fromCache) {
|
||||
// Cache-only prepared: the room list is still being restored, so wait
|
||||
// for it, but hide anyway once the grace expires so we never block the
|
||||
// UI when offline.
|
||||
if (firstNetworkSyncGrace.current === undefined) {
|
||||
firstNetworkSyncGrace.current = window.setTimeout(() => {
|
||||
firstNetworkSyncGrace.current = undefined;
|
||||
scheduleHide('cache grace expired');
|
||||
}, 5000);
|
||||
}
|
||||
} else {
|
||||
// First network sync completed: whatever we have is what the UI shows.
|
||||
scheduleHide('first network sync completed');
|
||||
}
|
||||
recoverInFlight.current = false;
|
||||
return;
|
||||
}
|
||||
|
||||
if (state !== SyncState.Error || !client || recoverInFlight.current) {
|
||||
if (state !== SyncState.Error || !client) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Sync failed (no network, first sync never landed). Show whatever the
|
||||
// cache restored instead of leaving the splash up.
|
||||
if (client.getRooms().length > 0) scheduleHide('sync error with cached chats');
|
||||
|
||||
if (recoverInFlight.current) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -243,7 +389,7 @@ export function ClientRoot({ children }: ClientRootProps) {
|
||||
|
||||
// Give Wi‑Fi a moment to come back after lid open / resume
|
||||
window.setTimeout(recover, 1500);
|
||||
}, [])
|
||||
}, [tryHide, scheduleHide])
|
||||
);
|
||||
|
||||
// Also nudge sync when the laptop wakes / network returns
|
||||
@@ -274,6 +420,7 @@ export function ClientRoot({ children }: ClientRootProps) {
|
||||
return (
|
||||
<SpecVersions baseUrl={baseUrl!}>
|
||||
<TitleBar mx={mx} />
|
||||
{mx && <ClientAtomBinder mx={mx} />}
|
||||
{(loadState.status === AsyncStatus.Error || startState.status === AsyncStatus.Error) && (
|
||||
<SplashScreen>
|
||||
<Box direction="Column" grow="Yes" alignItems="Center" justifyContent="Center" gap="400">
|
||||
@@ -296,7 +443,7 @@ export function ClientRoot({ children }: ClientRootProps) {
|
||||
</SplashScreen>
|
||||
)}
|
||||
{loading || !mx ? (
|
||||
<ClientRootLoading />
|
||||
<ClientLoading mx={mx} />
|
||||
) : (
|
||||
<MatrixClientProvider value={mx}>
|
||||
<PluginLoader matrixClient={mx}>
|
||||
|
||||
@@ -17,7 +17,21 @@ import {
|
||||
} from 'html-react-parser';
|
||||
import { MatrixClient } from 'matrix-js-sdk';
|
||||
import classNames from 'classnames';
|
||||
import { Box, Chip, config, Header, IconButton, Scroll, Text, toRem } from 'folds';
|
||||
import {
|
||||
Box,
|
||||
Button,
|
||||
Chip,
|
||||
config,
|
||||
Header,
|
||||
IconButton,
|
||||
Menu,
|
||||
MenuItem,
|
||||
PopOut,
|
||||
RectCords,
|
||||
Scroll,
|
||||
Text,
|
||||
toRem,
|
||||
} from 'folds';
|
||||
import { Icon, Icons } from '../components/icons';
|
||||
import { IntermediateRepresentation, Opts as LinkifyOpts, OptFn } from 'linkifyjs';
|
||||
import Linkify from 'linkify-react';
|
||||
@@ -40,13 +54,22 @@ import {
|
||||
parseMatrixToUser,
|
||||
testMatrixTo,
|
||||
} from './matrix-to';
|
||||
import { onEnterOrSpace } from '../utils/keyboard';
|
||||
import { onEnterOrSpace, stopPropagation } from '../utils/keyboard';
|
||||
import { copyToClipboard, tryDecodeURIComponent } from '../utils/dom';
|
||||
import { useTimeoutToggle } from '../hooks/useTimeoutToggle';
|
||||
import { settingsAtom } from '../state/settings';
|
||||
import { useSetting } from '../state/hooks/settings';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import {
|
||||
AUTO_LANGUAGE,
|
||||
LANGUAGE_OPTIONS,
|
||||
PLAIN_LANGUAGE,
|
||||
} from './react-prism/languages';
|
||||
import { AuthenticatedImg } from '../components/authenticated-media';
|
||||
import { openExternalUrl } from '../utils/tauri';
|
||||
|
||||
const ReactPrism = lazy(() => import('./react-prism/ReactPrism'));
|
||||
const PrismCode = lazy(() => import('./react-prism/PrismCode'));
|
||||
|
||||
/**
|
||||
* Click handler for external links - uses Tauri shell on desktop/mobile
|
||||
@@ -242,13 +265,7 @@ const extractTextFromChildren = (nodes: ChildNode[]): string => {
|
||||
return text;
|
||||
};
|
||||
|
||||
export function CodeBlock({
|
||||
children,
|
||||
opts,
|
||||
}: {
|
||||
children: ChildNode[];
|
||||
opts: HTMLReactParserOptions;
|
||||
}) {
|
||||
export function CodeBlock({ children }: { children: ChildNode[] }) {
|
||||
const code = children[0];
|
||||
const languageClass =
|
||||
code instanceof Element && code.name === 'code' ? code.attribs.class : undefined;
|
||||
@@ -257,20 +274,48 @@ export function CodeBlock({
|
||||
? languageClass.replace('language-', '')
|
||||
: languageClass;
|
||||
|
||||
const text = useMemo(() => extractTextFromChildren(children).replace(/\n$/, ''), [children]);
|
||||
|
||||
const LINE_LIMIT = 14;
|
||||
const largeCodeBlock = useMemo(
|
||||
() => extractTextFromChildren(children).split('\n').length > LINE_LIMIT,
|
||||
[children]
|
||||
);
|
||||
const largeCodeBlock = useMemo(() => text.split('\n').length > LINE_LIMIT, [text]);
|
||||
|
||||
const [expanded, setExpand] = useState(false);
|
||||
const [copied, setCopied] = useTimeoutToggle();
|
||||
|
||||
// Word wrap and line numbers are remembered as preferences, but can be toggled per code block
|
||||
const [wrapSetting, setWrapSetting] = useSetting(settingsAtom, 'codeWordWrap');
|
||||
const [lineNumbersSetting, setLineNumbersSetting] = useSetting(settingsAtom, 'codeLineNumbers');
|
||||
const [wrap, setWrap] = useState(wrapSetting);
|
||||
const [lineNumbers, setLineNumbers] = useState(lineNumbersSetting);
|
||||
|
||||
// Language override for this block (empty means use the language the message declared)
|
||||
const [override, setOverride] = useState(AUTO_LANGUAGE);
|
||||
const [menuCords, setMenuCords] = useState<RectCords>();
|
||||
|
||||
const activeLanguage =
|
||||
override === AUTO_LANGUAGE ? language : override === PLAIN_LANGUAGE ? undefined : override;
|
||||
const languageLabel =
|
||||
override === AUTO_LANGUAGE
|
||||
? language ?? 'Code'
|
||||
: (LANGUAGE_OPTIONS.find((option) => option.value === override)?.label ?? override);
|
||||
|
||||
const handleCopy = () => {
|
||||
copyToClipboard(extractTextFromChildren(children));
|
||||
copyToClipboard(text);
|
||||
setCopied();
|
||||
};
|
||||
|
||||
const toggleWrap = () => {
|
||||
const next = !wrap;
|
||||
setWrap(next);
|
||||
setWrapSetting(next);
|
||||
};
|
||||
|
||||
const toggleLineNumbers = () => {
|
||||
const next = !lineNumbers;
|
||||
setLineNumbers(next);
|
||||
setLineNumbersSetting(next);
|
||||
};
|
||||
|
||||
const toggleExpand = () => {
|
||||
setExpand(!expanded);
|
||||
};
|
||||
@@ -279,11 +324,51 @@ export function CodeBlock({
|
||||
<Text size="T300" as="pre" className={css.CodeBlock}>
|
||||
<Header variant="Surface" size="400" className={css.CodeBlockHeader}>
|
||||
<Box grow="Yes">
|
||||
<Text size="L400" truncate>
|
||||
{language ?? 'Code'}
|
||||
</Text>
|
||||
<Button
|
||||
variant="Surface"
|
||||
fill="None"
|
||||
size="300"
|
||||
radii="300"
|
||||
type="button"
|
||||
aria-haspopup="true"
|
||||
aria-expanded={!!menuCords}
|
||||
title="Override language"
|
||||
after={<Icon size="100" src={Icons.ChevronBottom} />}
|
||||
onClick={(event) => {
|
||||
event.stopPropagation();
|
||||
setMenuCords(event.currentTarget.getBoundingClientRect());
|
||||
}}
|
||||
>
|
||||
<Text size="B300" truncate>
|
||||
{languageLabel}
|
||||
</Text>
|
||||
</Button>
|
||||
</Box>
|
||||
<Box shrink="No" gap="200">
|
||||
<Chip
|
||||
variant={wrap ? 'Primary' : 'Surface'}
|
||||
fill="None"
|
||||
radii="Pill"
|
||||
outlined
|
||||
aria-pressed={wrap}
|
||||
title="Toggle word wrap"
|
||||
onClick={toggleWrap}
|
||||
before={<Icon size="50" src={Icons.WrapText} />}
|
||||
>
|
||||
<Text size="B300">Wrap</Text>
|
||||
</Chip>
|
||||
<Chip
|
||||
variant={lineNumbers ? 'Primary' : 'Surface'}
|
||||
fill="None"
|
||||
radii="Pill"
|
||||
outlined
|
||||
aria-pressed={lineNumbers}
|
||||
title="Toggle line numbers"
|
||||
onClick={toggleLineNumbers}
|
||||
before={<Icon size="50" src={Icons.OrderList} />}
|
||||
>
|
||||
<Text size="B300">Lines</Text>
|
||||
</Chip>
|
||||
<Chip
|
||||
variant={copied ? 'Success' : 'Surface'}
|
||||
fill="None"
|
||||
@@ -315,19 +400,75 @@ export function CodeBlock({
|
||||
)}
|
||||
</Box>
|
||||
</Header>
|
||||
<PopOut
|
||||
anchor={menuCords}
|
||||
offset={5}
|
||||
position="Bottom"
|
||||
align="Start"
|
||||
content={
|
||||
<FocusTrap
|
||||
focusTrapOptions={{
|
||||
initialFocus: false,
|
||||
onDeactivate: () => setMenuCords(undefined),
|
||||
clickOutsideDeactivates: true,
|
||||
isKeyForward: (evt: KeyboardEvent) =>
|
||||
evt.key === 'ArrowDown' || evt.key === 'ArrowRight',
|
||||
isKeyBackward: (evt: KeyboardEvent) =>
|
||||
evt.key === 'ArrowUp' || evt.key === 'ArrowLeft',
|
||||
escapeDeactivates: stopPropagation,
|
||||
}}
|
||||
>
|
||||
<Scroll
|
||||
style={{ maxHeight: toRem(320) }}
|
||||
direction="Vertical"
|
||||
variant="Surface"
|
||||
size="300"
|
||||
visibility="Hover"
|
||||
hideTrack
|
||||
>
|
||||
<Menu>
|
||||
{LANGUAGE_OPTIONS.map((option) => (
|
||||
<MenuItem
|
||||
key={option.value || 'auto'}
|
||||
size="300"
|
||||
variant={option.value === override ? 'SurfaceVariant' : 'Surface'}
|
||||
aria-selected={option.value === override}
|
||||
radii="300"
|
||||
onClick={() => {
|
||||
setMenuCords(undefined);
|
||||
setOverride(option.value);
|
||||
}}
|
||||
>
|
||||
<Box grow="Yes">
|
||||
<Text size="T300">{option.label}</Text>
|
||||
</Box>
|
||||
</MenuItem>
|
||||
))}
|
||||
</Menu>
|
||||
</Scroll>
|
||||
</FocusTrap>
|
||||
}
|
||||
/>
|
||||
<Scroll
|
||||
style={{
|
||||
maxHeight: largeCodeBlock && !expanded ? toRem(300) : undefined,
|
||||
paddingBottom: largeCodeBlock ? config.space.S400 : undefined,
|
||||
}}
|
||||
direction="Both"
|
||||
direction={wrap ? 'Vertical' : 'Both'}
|
||||
variant="SurfaceVariant"
|
||||
size="300"
|
||||
visibility="Hover"
|
||||
hideTrack
|
||||
>
|
||||
<div id="code-block-content" className={css.CodeBlockInternal}>
|
||||
{domToReact(children, opts)}
|
||||
<div
|
||||
id="code-block-content"
|
||||
className={wrap ? css.CodeBlockInternalWrapped : css.CodeBlockInternal}
|
||||
>
|
||||
<ErrorBoundary fallback={<code className={css.CodeBlockContent}>{text}</code>}>
|
||||
<Suspense fallback={<code className={css.CodeBlockContent}>{text}</code>}>
|
||||
<PrismCode text={text} language={activeLanguage} showLineNumbers={lineNumbers} />
|
||||
</Suspense>
|
||||
</ErrorBoundary>
|
||||
</div>
|
||||
</Scroll>
|
||||
{largeCodeBlock && !expanded && <Box className={css.CodeBlockBottomShadow} />}
|
||||
@@ -444,7 +585,7 @@ export const getReactCustomHtmlParser = (
|
||||
}
|
||||
|
||||
if (name === 'pre') {
|
||||
return <CodeBlock opts={opts}>{children}</CodeBlock>;
|
||||
return <CodeBlock>{children}</CodeBlock>;
|
||||
}
|
||||
|
||||
if (name === 'blockquote') {
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
import classNames from 'classnames';
|
||||
import Prism from 'prismjs';
|
||||
import * as css from '../../styles/CustomHtml.css';
|
||||
|
||||
// Side-effect import: registers every prism language grammar and the token colors
|
||||
// used by the classes below (`token <type>` inside a `code` element).
|
||||
import './ReactPrism';
|
||||
|
||||
export type PrismSegment = {
|
||||
type?: string;
|
||||
text: string;
|
||||
};
|
||||
|
||||
export type PrismLine = PrismSegment[];
|
||||
|
||||
/**
|
||||
* Tokenizes `text` with the prism grammar of `language` and splits the result into
|
||||
* lines. Tokens spanning multiple lines (block comments, multiline strings) are split
|
||||
* so every line keeps the token type of its segments, which keeps the colors correct
|
||||
* when lines are rendered one row at a time.
|
||||
*/
|
||||
export function tokenizeToLines(text: string, language?: string): PrismLine[] {
|
||||
const grammar = language ? Prism.languages[language] : undefined;
|
||||
if (!grammar) return text.split('\n').map((line) => [{ text: line }]);
|
||||
|
||||
const lines: PrismLine[] = [[]];
|
||||
|
||||
const append = (type: string | undefined, value: string) => {
|
||||
const parts = value.split('\n');
|
||||
parts.forEach((part, index) => {
|
||||
if (index > 0) lines.push([]);
|
||||
if (part) lines[lines.length - 1].push({ type, text: part });
|
||||
});
|
||||
};
|
||||
|
||||
const walk = (stream: Prism.TokenStream, type?: string) => {
|
||||
if (typeof stream === 'string') {
|
||||
append(type, stream);
|
||||
return;
|
||||
}
|
||||
|
||||
if (Array.isArray(stream)) {
|
||||
stream.forEach((child) => walk(child, type));
|
||||
return;
|
||||
}
|
||||
|
||||
walk(stream.content, stream.type);
|
||||
};
|
||||
|
||||
Prism.tokenize(text, grammar).forEach((token) => walk(token));
|
||||
|
||||
return lines;
|
||||
}
|
||||
|
||||
export default function PrismCode({
|
||||
text,
|
||||
language,
|
||||
showLineNumbers,
|
||||
}: {
|
||||
text: string;
|
||||
language?: string;
|
||||
showLineNumbers: boolean;
|
||||
}) {
|
||||
const lines = tokenizeToLines(text, language);
|
||||
|
||||
return (
|
||||
<code className={classNames(css.CodeBlockContent, language)}>
|
||||
{lines.map((line, lineIndex) => (
|
||||
<span key={`line-${lineIndex}`} className={css.CodeBlockLine}>
|
||||
{showLineNumbers && <span className={css.CodeBlockLineNumber}>{lineIndex + 1}</span>}
|
||||
<span className={css.CodeBlockLineContent}>
|
||||
{line.map((segment, segmentIndex) =>
|
||||
segment.type ? (
|
||||
<span key={`token-${segmentIndex}`} className={`token ${segment.type}`}>
|
||||
{segment.text}
|
||||
</span>
|
||||
) : (
|
||||
segment.text
|
||||
),
|
||||
)}
|
||||
</span>
|
||||
</span>
|
||||
))}
|
||||
</code>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
// Languages offered by the code block language override menu.
|
||||
// Every entry is registered by the prism component imports in ReactPrism.tsx.
|
||||
export type LanguageOption = {
|
||||
value: string;
|
||||
label: string;
|
||||
};
|
||||
|
||||
// Empty value means "use the language the message declared"
|
||||
export const AUTO_LANGUAGE = '';
|
||||
export const PLAIN_LANGUAGE = 'plain';
|
||||
|
||||
export const LANGUAGE_OPTIONS: LanguageOption[] = [
|
||||
{ value: AUTO_LANGUAGE, label: 'Auto' },
|
||||
{ value: PLAIN_LANGUAGE, label: 'Plain text' },
|
||||
{ value: 'bash', label: 'Bash' },
|
||||
{ value: 'c', label: 'C' },
|
||||
{ value: 'cpp', label: 'C++' },
|
||||
{ value: 'csharp', label: 'C#' },
|
||||
{ value: 'css', label: 'CSS' },
|
||||
{ value: 'diff', label: 'Diff' },
|
||||
{ value: 'docker', label: 'Docker' },
|
||||
{ value: 'go', label: 'Go' },
|
||||
{ value: 'graphql', label: 'GraphQL' },
|
||||
{ value: 'html', label: 'HTML' },
|
||||
{ value: 'ini', label: 'INI' },
|
||||
{ value: 'java', label: 'Java' },
|
||||
{ value: 'javascript', label: 'JavaScript' },
|
||||
{ value: 'json', label: 'JSON' },
|
||||
{ value: 'jsx', label: 'JSX' },
|
||||
{ value: 'kotlin', label: 'Kotlin' },
|
||||
{ value: 'lua', label: 'Lua' },
|
||||
{ value: 'markdown', label: 'Markdown' },
|
||||
{ value: 'properties', label: 'Properties' },
|
||||
{ value: 'python', label: 'Python' },
|
||||
{ value: 'rust', label: 'Rust' },
|
||||
{ value: 'sass', label: 'Sass' },
|
||||
{ value: 'sql', label: 'SQL' },
|
||||
{ value: 'toml', label: 'TOML' },
|
||||
{ value: 'tsx', label: 'TSX' },
|
||||
{ value: 'typescript', label: 'TypeScript' },
|
||||
{ value: 'xml', label: 'XML' },
|
||||
{ value: 'yaml', label: 'YAML' },
|
||||
];
|
||||
@@ -51,6 +51,8 @@ export interface Settings {
|
||||
showHiddenEvents: boolean;
|
||||
legacyUsernameColor: boolean;
|
||||
sidebarNameplateOpacity: number;
|
||||
codeWordWrap: boolean;
|
||||
codeLineNumbers: boolean;
|
||||
|
||||
showNotifications: boolean;
|
||||
isNotificationSounds: boolean;
|
||||
@@ -95,6 +97,8 @@ const defaultSettings: Settings = {
|
||||
showHiddenEvents: false,
|
||||
legacyUsernameColor: false,
|
||||
sidebarNameplateOpacity: 60,
|
||||
codeWordWrap: true,
|
||||
codeLineNumbers: true,
|
||||
|
||||
showNotifications: true,
|
||||
isNotificationSounds: true,
|
||||
|
||||
@@ -165,6 +165,44 @@ export const CodeBlockInternal = style([
|
||||
},
|
||||
]);
|
||||
|
||||
export const CodeBlockInternalWrapped = style([
|
||||
CodeBlockInternal,
|
||||
{
|
||||
whiteSpace: 'pre-wrap',
|
||||
overflowWrap: 'anywhere',
|
||||
wordBreak: 'break-word',
|
||||
},
|
||||
]);
|
||||
|
||||
export const CodeBlockContent = style({
|
||||
display: 'block',
|
||||
});
|
||||
|
||||
export const CodeBlockLine = style({
|
||||
display: 'flex',
|
||||
alignItems: 'flex-start',
|
||||
gap: config.space.S200,
|
||||
// Keeps blank lines visible when line numbers are off (an empty row would
|
||||
// otherwise collapse to zero height because the newlines are no longer rendered)
|
||||
minHeight: '1lh',
|
||||
});
|
||||
|
||||
export const CodeBlockLineNumber = style([
|
||||
CodeFont,
|
||||
{
|
||||
flexShrink: 0,
|
||||
minWidth: toRem(24),
|
||||
textAlign: 'right',
|
||||
opacity: 0.6,
|
||||
userSelect: 'none',
|
||||
},
|
||||
]);
|
||||
|
||||
export const CodeBlockLineContent = style({
|
||||
flex: '1',
|
||||
minWidth: 0,
|
||||
});
|
||||
|
||||
export const CodeBlockBottomShadow = style({
|
||||
position: 'absolute',
|
||||
bottom: 0,
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
import { MatrixClient, RelationType, Room } from 'matrix-js-sdk';
|
||||
|
||||
/**
|
||||
* Client-defined event marking that Paarrot has received a message.
|
||||
*
|
||||
* The spec has no delivery receipt type - Synapse only accepts `m.read`,
|
||||
* `m.read.private` and `m.fully_read` on the receipts endpoint - so delivery is
|
||||
* recorded as a custom event related to the target message with `m.reference`.
|
||||
*
|
||||
* It never shows in the cinny timeline (events with a relation are skipped
|
||||
* unless "show hidden events" is on), and other clients only see an unknown
|
||||
* event. Delivery is always self-reported: in E2EE, only the receiving client
|
||||
* can know it actually got the event.
|
||||
*/
|
||||
export const PAARROT_RECEIVED_EVENT = 'com.paarrot.received';
|
||||
|
||||
export const getReceivedContent = (eventId: string) => ({
|
||||
'm.relates_to': {
|
||||
event_id: eventId,
|
||||
rel_type: RelationType.Reference,
|
||||
},
|
||||
});
|
||||
|
||||
export const getEventDeliveryRelations = (room: Room, eventId: string) =>
|
||||
room
|
||||
.getUnfilteredTimelineSet()
|
||||
.relations.getChildEventsForEvent(eventId, RelationType.Reference, PAARROT_RECEIVED_EVENT);
|
||||
|
||||
export const hasReceivedMarker = (room: Room, eventId: string, userId: string): boolean => {
|
||||
const relations = getEventDeliveryRelations(room, eventId);
|
||||
if (!relations) return false;
|
||||
|
||||
return relations
|
||||
.getRelations()
|
||||
.some(
|
||||
(rel) =>
|
||||
!rel.isRedacted() && rel.getSender() === userId && rel.getRelation()?.event_id === eventId,
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
* Sends the delivery marker for `eventId`. Skips events that are still local
|
||||
* echoes (no `$` id yet) and events this user already marked, so a room that
|
||||
* re-syncs does not spam markers.
|
||||
*/
|
||||
export async function sendReceivedMarker(mx: MatrixClient, room: Room, eventId: string) {
|
||||
const userId = mx.getUserId();
|
||||
if (!userId || !eventId.startsWith('$')) return false;
|
||||
if (hasReceivedMarker(room, eventId, userId)) return false;
|
||||
|
||||
await mx.sendEvent(room.roomId, PAARROT_RECEIVED_EVENT, getReceivedContent(eventId));
|
||||
return true;
|
||||
}
|
||||
+3
-1
@@ -361,7 +361,9 @@ export default defineConfig(() => ({
|
||||
build: {
|
||||
target: 'es2022',
|
||||
outDir: 'dist',
|
||||
sourcemap: true,
|
||||
// Maps are excluded from packaged builds anyway (electron-builder `!**/*.map`),
|
||||
// so skip generating them in CI to save build time.
|
||||
sourcemap: !process.env.CI,
|
||||
copyPublicDir: false,
|
||||
rollupOptions: {
|
||||
input: {
|
||||
|
||||
Reference in New Issue
Block a user