Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/feat-dm-message-preview.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sable/client': minor
---

feat(dm-list): show last-message preview below DM room name
Comment on lines +1 to +5
Copy link

Copilot AI Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changeset introduces a separate minor release entry for the DM message preview feature. If DM previews are intentionally part of this PR, the PR title/description should mention it; otherwise this changeset should probably be removed/split so release notes match the actual PR scope.

Copilot uses AI. Check for mistakes.
5 changes: 5 additions & 0 deletions .changeset/room-message-preview.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sable/client': minor
---

feat(room-nav): show topic and last-message preview for rooms in the sidebar, fetching enough timeline events to handle reactions and edits correctly
13 changes: 12 additions & 1 deletion src/app/features/room-nav/RoomNavItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ import { useAutoDiscoveryInfo } from '$hooks/useAutoDiscoveryInfo';
import { livekitSupport } from '$hooks/useLivekitSupport';
import { Presence, useUserPresence } from '$hooks/useUserPresence';
import { AvatarPresence, PresenceBadge } from '$components/presence';
import { useRoomLastMessage } from '$hooks/useRoomLastMessage';
import { RoomNavUser } from './RoomNavUser';

/**
Expand Down Expand Up @@ -258,6 +259,9 @@ type RoomNavItemProps = {
showAvatar?: boolean;
direct?: boolean;
customDMCards?: boolean;
roomTopicPreview?: boolean;
roomMessagePreview?: boolean;
dmMessagePreview?: boolean;
};

export function RoomNavItem({
Expand All @@ -266,6 +270,9 @@ export function RoomNavItem({
showAvatar,
direct,
customDMCards,
roomTopicPreview = false,
roomMessagePreview = false,
dmMessagePreview = true,
notificationMode,
linkPath,
}: RoomNavItemProps) {
Expand All @@ -287,8 +294,12 @@ export function RoomNavItem({
const matrixRoomName = useRoomName(room);
const roomName = (dmUserId && nicknames[dmUserId]) || matrixRoomName;
const presence = useUserPresence(dmUserId ?? '');
const showPreview = direct ? dmMessagePreview : roomMessagePreview;
const lastMessage = useRoomLastMessage(showPreview ? room : undefined, mx);
const getRoomTopic = useRoomTopic(room);
const roomTopic = direct ? ((customDMCards && getRoomTopic) ?? presence?.status) : undefined;
const roomTopic = direct
? (customDMCards && getRoomTopic) || lastMessage || presence?.status
: (roomTopicPreview && getRoomTopic) || (roomMessagePreview ? lastMessage : undefined);

const { navigateRoom } = useRoomNavigate();
const navigate = useNavigate();
Expand Down
43 changes: 43 additions & 0 deletions src/app/features/settings/cosmetics/Themes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -482,11 +482,17 @@ function PageZoomInput() {
export function Appearance() {
const [twitterEmoji, setTwitterEmoji] = useSetting(settingsAtom, 'twitterEmoji');
const [customDMCards, setCustomDMCards] = useSetting(settingsAtom, 'customDMCards');
const [dmMessagePreview, setDmMessagePreview] = useSetting(settingsAtom, 'dmMessagePreview');
const [showEasterEggs, setShowEasterEggs] = useSetting(settingsAtom, 'showEasterEggs');
const [closeFoldersByDefault, setCloseFoldersByDefault] = useSetting(
settingsAtom,
'closeFoldersByDefault'
);
const [roomTopicPreview, setRoomTopicPreview] = useSetting(settingsAtom, 'roomTopicPreview');
const [roomMessagePreview, setRoomMessagePreview] = useSetting(
settingsAtom,
'roomMessagePreview'
);

return (
<Box direction="Column" gap="700">
Expand Down Expand Up @@ -529,6 +535,43 @@ export function Appearance() {
/>
</SequenceCard>

<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
<SettingTile
title="DM Message Preview"
focusId="dm-message-preview"
description="Show a preview of the last message below DM room names."
after={
<Switch variant="Primary" value={dmMessagePreview} onChange={setDmMessagePreview} />
}
/>
</SequenceCard>

<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
<SettingTile
title="Room Topic Preview"
focusId="room-topic-preview"
description="Show the room topic below room names in spaces and Home."
after={
<Switch variant="Primary" value={roomTopicPreview} onChange={setRoomTopicPreview} />
}
/>
</SequenceCard>

<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
<SettingTile
title="Room Message Preview"
focusId="room-message-preview"
description="Show the latest message below room names in spaces and Home."
after={
<Switch
variant="Primary"
value={roomMessagePreview}
onChange={setRoomMessagePreview}
/>
}
/>
</SequenceCard>

<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
<SettingTile
title="Show Easter Eggs"
Expand Down
95 changes: 95 additions & 0 deletions src/app/hooks/useRoomLastMessage.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
import { useEffect, useState } from 'react';
import {
MatrixClient,
MatrixEvent,
MatrixEventEvent,
MsgType,
Room,
RoomEvent as RoomEventEnum,
} from '$types/matrix-sdk';
import { MessageEvent } from '$types/matrix/room';

function eventToPreviewText(ev: MatrixEvent): string | undefined {
if (ev.isRedacted()) return undefined;

const type = ev.getType();

if (type === MessageEvent.RoomMessageEncrypted) return '🔒 Encrypted message';

if (type === MessageEvent.RoomMessage) {
const content = ev.getContent();
const { msgtype } = content;
if (msgtype === MsgType.Text || msgtype === MsgType.Emote || msgtype === MsgType.Notice) {
return content.body;
}
Comment on lines +19 to +24
Copy link

Copilot AI Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For text messages, this returns content.body verbatim. For replies, body typically contains the quoted fallback ("> …") which will make the room list preview noisy; elsewhere in the codebase trimReplyFromBody() is used to strip that. It would be more consistent to apply the same trimming here (and guard body being a string).

Copilot uses AI. Check for mistakes.
if (msgtype === MsgType.Image) return '📷 Image';
if (msgtype === MsgType.Video) return '📹 Video';
if (msgtype === MsgType.Audio) return '🎵 Audio';
if (msgtype === MsgType.File) return '📎 File';
}

if (type === MessageEvent.Sticker) {
return `🎉 ${ev.getContent().body ?? 'Sticker'}`;
}

return undefined;
}

function getLastMessageText(room: Room, mx: MatrixClient): string | undefined {
const events = room.getLiveTimeline().getEvents();
const match = [...events].reverse().find((ev) => eventToPreviewText(ev) !== undefined);
Comment on lines +38 to +40
Copy link

Copilot AI Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getLastMessageText() currently doesn't filter out reaction/edit relation events. Edit events are m.room.message with m.relates_to.rel_type = m.replace (or m.new_content) and will often become the newest timeline event, causing the sidebar preview to show the edit payload (e.g. "* edited") instead of the actual latest message. Consider skipping reactionOrEditEvent(ev) (see $utils/room.ts) when scanning the live timeline, similar to useRoomLatestRenderedEvent.

Suggested change
function getLastMessageText(room: Room, mx: MatrixClient): string | undefined {
const events = room.getLiveTimeline().getEvents();
const match = [...events].reverse().find((ev) => eventToPreviewText(ev) !== undefined);
function reactionOrEditEvent(ev: MatrixEvent): boolean {
const type = ev.getType();
const content = ev.getContent();
if (type === 'm.reaction') return true;
if (type !== MessageEvent.RoomMessage) return false;
const relatesTo = content?.['m.relates_to'];
return relatesTo?.rel_type === 'm.replace' || content?.['m.new_content'] !== undefined;
}
function getLastMessageText(room: Room, mx: MatrixClient): string | undefined {
const events = room.getLiveTimeline().getEvents();
const match = [...events]
.reverse()
.find((ev) => !reactionOrEditEvent(ev) && eventToPreviewText(ev) !== undefined);

Copilot uses AI. Check for mistakes.
if (!match) return undefined;
const text = eventToPreviewText(match);
if (!text) return undefined;

const senderId = match.getSender();
let prefix: string;
if (senderId === mx.getUserId()) {
prefix = 'You';
} else {
prefix = room.getMember(senderId ?? '')?.name ?? senderId ?? 'Unknown';
}
return `${prefix}: ${text}`;
}

/**
* Reactively returns a human-readable preview of the last message in a room's
* live timeline, prefixed with "You:" or the sender's display name.
* Listens to Timeline and Decrypted events so the preview updates as messages
* arrive or are decrypted.
* Pass `undefined` for room to disable (returns `undefined`).
*/
export function useRoomLastMessage(
room: Room | undefined,
mx: MatrixClient | undefined
): string | undefined {
const [text, setText] = useState<string | undefined>(() =>
room && mx ? getLastMessageText(room, mx) : undefined
);

useEffect(() => {
if (!room || !mx) {
setText(undefined);
return undefined;
}
setText(getLastMessageText(room, mx));

const update = () => setText(getLastMessageText(room, mx));
room.on(RoomEventEnum.Timeline, update);
room.on(RoomEventEnum.LocalEchoUpdated, update);

// Re-check when any event in this room is decrypted (encrypted → plaintext).
const onDecrypted = (ev: MatrixEvent) => {
if (ev.getRoomId() === room.roomId) update();
};
mx.on(MatrixEventEvent.Decrypted, onDecrypted);

return () => {
room.off(RoomEventEnum.Timeline, update);
room.off(RoomEventEnum.LocalEchoUpdated, update);
mx.off(MatrixEventEvent.Decrypted, onDecrypted);
};
}, [room, mx]);

return text;
}
Comment on lines +62 to +95
Copy link

Copilot AI Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This hook is new behavior that affects sidebar rendering and has several edge cases (replies, edits, redactions, encrypted→decrypted transitions). The repo already uses Vitest for hook-level tests; adding focused unit tests for useRoomLastMessage (e.g., skipping edits/reactions, trimming reply fallback, updating on decryption) would help prevent regressions.

Copilot uses AI. Check for mistakes.
15 changes: 11 additions & 4 deletions src/app/pages/client/ClientRoot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import { useSyncNicknames } from '$hooks/useNickname';
import { useAppVisibility } from '$hooks/useAppVisibility';
import { getHomePath } from '$pages/pathUtils';
import { useClientConfig } from '$hooks/useClientConfig';
import { getSettings } from '$state/settings';
import { pushSessionToSW } from '../../../sw-session';
import { SyncStatus } from './SyncStatus';
import { SpecVersions } from './SpecVersions';
Expand Down Expand Up @@ -212,12 +213,18 @@ export function ClientRoot({ children }: ClientRootProps) {

const [startState, startMatrix] = useAsyncCallback<void, Error, [MatrixClient]>(
useCallback(
(m) =>
startClient(m, {
(m) => {
const s = getSettings();
const needsPreviewTimeline = s.dmMessagePreview || s.roomMessagePreview;
return startClient(m, {
baseUrl: activeSession?.baseUrl,
slidingSync: clientConfig.slidingSync,
slidingSync: {
...clientConfig.slidingSync,
listTimelineLimit: needsPreviewTimeline ? 5 : undefined,
},
sessionSlidingSyncOptIn: activeSession?.slidingSyncOptIn,
}),
});
},
[activeSession?.baseUrl, activeSession?.slidingSyncOptIn, clientConfig.slidingSync]
)
);
Expand Down
2 changes: 2 additions & 0 deletions src/app/pages/client/direct/Direct.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ export function Direct() {
const roomToUnread = useAtomValue(roomToUnreadAtom);
const navigate = useNavigate();
const [customDMCards] = useSetting(settingsAtom, 'customDMCards');
const [dmMessagePreview] = useSetting(settingsAtom, 'dmMessagePreview');

const createDirectSelected = useDirectCreateSelected();

Expand Down Expand Up @@ -296,6 +297,7 @@ export function Direct() {
showAvatar
direct
customDMCards={customDMCards}
dmMessagePreview={dmMessagePreview}
linkPath={getDirectRoomPath(getCanonicalAliasOrRoomId(mx, roomId))}
notificationMode={getRoomNotificationMode(
notificationPreferences,
Expand Down
4 changes: 4 additions & 0 deletions src/app/pages/client/home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ export function Home() {
const notificationPreferences = useRoomsNotificationPreferencesContext();
const roomToUnread = useAtomValue(roomToUnreadAtom);
const navigate = useNavigate();
const [roomTopicPreview] = useSetting(settingsAtom, 'roomTopicPreview');
const [roomMessagePreview] = useSetting(settingsAtom, 'roomMessagePreview');

const selectedRoomId = useSelectedRoom();
const createRoomSelected = useHomeCreateSelected();
Expand Down Expand Up @@ -344,6 +346,8 @@ export function Home() {
<RoomNavItem
room={room}
selected={selected}
roomTopicPreview={roomTopicPreview}
roomMessagePreview={roomMessagePreview}
linkPath={getHomeRoomPath(getCanonicalAliasOrRoomId(mx, roomId))}
notificationMode={getRoomNotificationMode(
notificationPreferences,
Expand Down
4 changes: 4 additions & 0 deletions src/app/pages/client/space/Space.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,8 @@ export function Space() {
* Determines the depth limit for the joined space hierarchy and the SpaceNavItems to start appearing
*/
const [subspaceHierarchyLimit] = useSetting(settingsAtom, 'subspaceHierarchyLimit');
const [roomTopicPreview] = useSetting(settingsAtom, 'roomTopicPreview');
const [roomMessagePreview] = useSetting(settingsAtom, 'roomMessagePreview');
/**
* Creates an SVG used for connecting spaces to their subrooms.
* @param virtualizedItems - The virtualized item list that will be used to render elements in the nav
Expand Down Expand Up @@ -826,6 +828,8 @@ export function Space() {
selected={selectedRoomId === roomId}
showAvatar={mDirects.has(roomId)}
direct={mDirects.has(roomId)}
roomTopicPreview={roomTopicPreview}
roomMessagePreview={roomMessagePreview}
Copy link

Copilot AI Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RoomNavItem now gates DM previews via the dmMessagePreview prop, but Space.tsx marks items as direct without passing the actual dmMessagePreview setting. That means DM preview visibility in the space sidebar will always use the default (true) and ignore the user's toggle. Consider reading dmMessagePreview here (like roomTopicPreview/roomMessagePreview) and passing it through when direct is true.

Suggested change
roomMessagePreview={roomMessagePreview}
roomMessagePreview={roomMessagePreview}
dmMessagePreview={dmMessagePreview}

Copilot uses AI. Check for mistakes.
linkPath={getToLink(roomId)}
notificationMode={getRoomNotificationMode(
notificationPreferences,
Expand Down
6 changes: 6 additions & 0 deletions src/app/state/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ export interface Settings {
mentionInReplies: boolean;
showPersonaSetting: boolean;
closeFoldersByDefault: boolean;
roomTopicPreview: boolean;
roomMessagePreview: boolean;
dmMessagePreview: boolean;

// furry stuff
renderAnimals: boolean;
Expand Down Expand Up @@ -219,6 +222,9 @@ const defaultSettings: Settings = {
mentionInReplies: true,
showPersonaSetting: false,
closeFoldersByDefault: false,
roomTopicPreview: false,
roomMessagePreview: false,
dmMessagePreview: true,

// furry stuff
renderAnimals: true,
Expand Down
Loading
Loading