mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-21 09:31:17 -08:00
Merge branch 'dev' into reply-to-state
This commit is contained in:
21 files changed
+176
-49
No files matched your search
@@ -2,4 +2,4 @@
|
||||
sable: minor
|
||||
---
|
||||
|
||||
# Add setting to enable picture-in-picture in element-call
|
||||
Add setting to enable picture-in-picture in element-call
|
||||
@@ -0,0 +1,5 @@
|
||||
---
|
||||
sable: patch
|
||||
---
|
||||
|
||||
Fix Element Call video/audio calls in DM and non-voice rooms: after joining through the lobby, the in-call grid now displays correctly instead of showing only the control bar.
|
||||
@@ -0,0 +1,5 @@
|
||||
---
|
||||
sable: patch
|
||||
---
|
||||
|
||||
Split typing and read status settings, allowing toggling off one and not the other.
|
||||
@@ -15,6 +15,7 @@ import {
|
||||
MatrixClient,
|
||||
MatrixEvent,
|
||||
MatrixEventEvent,
|
||||
Room,
|
||||
RoomStateEvent,
|
||||
} from '$types/matrix-sdk';
|
||||
import {
|
||||
@@ -33,6 +34,25 @@ import { SmallWidgetDriver } from './SmallWidgetDriver';
|
||||
|
||||
const log = createLogger('SmallWidget');
|
||||
|
||||
/**
|
||||
* Returns the appropriate EC `intent` and `callIntent` URL params for a room.
|
||||
* - Voice rooms (`isCallRoom()`): `join_existing` intent, `audio` callType (persistent channel).
|
||||
* - DM rooms (≤2 joined members): `start_call` intent, `video` callType (1:1 video call).
|
||||
* - Group rooms: `start_call` intent, `audio` callType.
|
||||
*/
|
||||
export function getCallIntentParams(room: Room | null | undefined): {
|
||||
intent: 'join_existing' | 'start_call';
|
||||
callIntentParam: 'audio' | 'video';
|
||||
} {
|
||||
const isVoiceRoom = room?.isCallRoom() ?? false;
|
||||
// Require room to be non-null: unknown/missing room should not be treated as a DM.
|
||||
const isDmRoom = room != null && !isVoiceRoom && room.currentState.getJoinedMemberCount() <= 2;
|
||||
return {
|
||||
intent: isVoiceRoom ? 'join_existing' : 'start_call',
|
||||
callIntentParam: isDmRoom ? 'video' : 'audio',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates the URL for the Element Call widget.
|
||||
* @param mx - The MatrixClient instance.
|
||||
|
||||
@@ -295,16 +295,26 @@ export class SmallWidgetDriver extends WidgetDriver {
|
||||
|
||||
/**
|
||||
* @experimental Part of MSC4140 & MSC4157
|
||||
* ClientWidgetApi dispatches three specific actions; the base WidgetDriver.updateDelayedEvent
|
||||
* is never called. Implementing all three prevents 'Failed to override function' errors and
|
||||
* the resulting 'Connection lost' in Element Call's MembershipManager.
|
||||
*/
|
||||
public async updateDelayedEvent(
|
||||
delayId: string,
|
||||
action: UpdateDelayedEventAction
|
||||
): Promise<void> {
|
||||
public async cancelScheduledDelayedEvent(delayId: string): Promise<void> {
|
||||
const client = this.mxClient;
|
||||
|
||||
if (!client) throw new Error('Not in a room or not attached to a client');
|
||||
await client._unstable_updateDelayedEvent(delayId, UpdateDelayedEventAction.Cancel);
|
||||
}
|
||||
|
||||
await client._unstable_updateDelayedEvent(delayId, action);
|
||||
public async restartScheduledDelayedEvent(delayId: string): Promise<void> {
|
||||
const client = this.mxClient;
|
||||
if (!client) throw new Error('Not in a room or not attached to a client');
|
||||
await client._unstable_updateDelayedEvent(delayId, UpdateDelayedEventAction.Restart);
|
||||
}
|
||||
|
||||
public async sendScheduledDelayedEvent(delayId: string): Promise<void> {
|
||||
const client = this.mxClient;
|
||||
if (!client) throw new Error('Not in a room or not attached to a client');
|
||||
await client._unstable_updateDelayedEvent(delayId, UpdateDelayedEventAction.Send);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -93,7 +93,7 @@ type RoomNavItemMenuProps = {
|
||||
const RoomNavItemMenu = forwardRef<HTMLDivElement, RoomNavItemMenuProps>(
|
||||
({ room, requestClose, notificationMode }, ref) => {
|
||||
const mx = useMatrixClient();
|
||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const [hideReads] = useSetting(settingsAtom, 'hideReads');
|
||||
const unread = useRoomUnread(room.roomId, roomToUnreadAtom);
|
||||
const powerLevels = usePowerLevels(room);
|
||||
const creators = useRoomCreators(room);
|
||||
@@ -106,7 +106,7 @@ const RoomNavItemMenu = forwardRef<HTMLDivElement, RoomNavItemMenuProps>(
|
||||
const [invitePrompt, setInvitePrompt] = useState(false);
|
||||
|
||||
const handleMarkAsRead = () => {
|
||||
markAsRead(mx, room.roomId, hideActivity);
|
||||
markAsRead(mx, room.roomId, hideReads);
|
||||
requestClose();
|
||||
};
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ export function Room() {
|
||||
|
||||
const [isDrawer] = useSetting(settingsAtom, 'isPeopleDrawer');
|
||||
const [isWidgetDrawerOpen] = useSetting(settingsAtom, 'isWidgetDrawer');
|
||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const [hideReads] = useSetting(settingsAtom, 'hideReads');
|
||||
const screenSize = useScreenSizeContext();
|
||||
const powerLevels = usePowerLevels(room);
|
||||
const members = useRoomMembers(mx, room.roomId);
|
||||
@@ -36,10 +36,10 @@ export function Room() {
|
||||
useCallback(
|
||||
(evt) => {
|
||||
if (isKeyHotkey('escape', evt)) {
|
||||
markAsRead(mx, room.roomId, hideActivity);
|
||||
markAsRead(mx, room.roomId, hideReads);
|
||||
}
|
||||
},
|
||||
[mx, room.roomId, hideActivity]
|
||||
[mx, room.roomId, hideReads]
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
@@ -560,7 +560,7 @@ export function RoomTimeline({
|
||||
}: RoomTimelineProps) {
|
||||
const mx = useMatrixClient();
|
||||
const useAuthentication = useMediaAuthentication();
|
||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const [hideReads] = useSetting(settingsAtom, 'hideReads');
|
||||
const [messageLayout] = useSetting(settingsAtom, 'messageLayout');
|
||||
const [messageSpacing] = useSetting(settingsAtom, 'messageSpacing');
|
||||
const [hideMembershipEvents] = useSetting(settingsAtom, 'hideMembershipEvents');
|
||||
@@ -754,7 +754,7 @@ export function RoomTimeline({
|
||||
// Check if the document is in focus (user is actively viewing the app),
|
||||
// and either there are no unread messages or the latest message is from the current user.
|
||||
// If either condition is met, trigger the markAsRead function to send a read receipt.
|
||||
requestAnimationFrame(() => markAsRead(mx, mEvt.getRoomId()!, hideActivity));
|
||||
requestAnimationFrame(() => markAsRead(mx, mEvt.getRoomId()!, hideReads));
|
||||
}
|
||||
|
||||
if (!document.hasFocus() && !unreadInfo) {
|
||||
@@ -780,7 +780,7 @@ export function RoomTimeline({
|
||||
setUnreadInfo(getRoomUnreadInfo(room));
|
||||
}
|
||||
},
|
||||
[mx, room, unreadInfo, hideActivity]
|
||||
[mx, room, unreadInfo, hideReads]
|
||||
)
|
||||
);
|
||||
|
||||
@@ -884,15 +884,15 @@ export function RoomTimeline({
|
||||
const tryAutoMarkAsRead = useCallback(() => {
|
||||
const readUptoEventId = readUptoEventIdRef.current;
|
||||
if (!readUptoEventId) {
|
||||
requestAnimationFrame(() => markAsRead(mx, room.roomId, hideActivity));
|
||||
requestAnimationFrame(() => markAsRead(mx, room.roomId, hideReads));
|
||||
return;
|
||||
}
|
||||
const evtTimeline = getEventTimeline(room, readUptoEventId);
|
||||
const latestTimeline = evtTimeline && getFirstLinkedTimeline(evtTimeline, Direction.Forward);
|
||||
if (latestTimeline === room.getLiveTimeline()) {
|
||||
requestAnimationFrame(() => markAsRead(mx, room.roomId, hideActivity));
|
||||
requestAnimationFrame(() => markAsRead(mx, room.roomId, hideReads));
|
||||
}
|
||||
}, [mx, room, hideActivity]);
|
||||
}, [mx, room, hideReads]);
|
||||
|
||||
const debounceSetAtBottom = useDebounce(
|
||||
useCallback((entry: IntersectionObserverEntry) => {
|
||||
@@ -1119,7 +1119,7 @@ export function RoomTimeline({
|
||||
};
|
||||
|
||||
const handleMarkAsRead = () => {
|
||||
markAsRead(mx, room.roomId, hideActivity);
|
||||
markAsRead(mx, room.roomId, hideReads);
|
||||
};
|
||||
|
||||
const handleOpenReply: MouseEventHandler = useCallback(
|
||||
|
||||
@@ -69,7 +69,7 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
|
||||
const roomInputRef = useRef<HTMLDivElement>(null);
|
||||
const roomViewRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const [hideReads] = useSetting(settingsAtom, 'hideReads');
|
||||
const screenSize = useScreenSizeContext();
|
||||
|
||||
const { roomId } = room;
|
||||
@@ -184,7 +184,7 @@ export function RoomView({ room, eventId }: { room: Room; eventId?: string }) {
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
{hideActivity ? <RoomViewFollowingPlaceholder /> : <RoomViewFollowing room={room} />}
|
||||
{hideReads ? <RoomViewFollowingPlaceholder /> : <RoomViewFollowing room={room} />}
|
||||
</Box>
|
||||
</SwipeableChatWrapper>
|
||||
</Page>
|
||||
|
||||
@@ -106,7 +106,7 @@ type RoomMenuProps = {
|
||||
};
|
||||
const RoomMenu = forwardRef<HTMLDivElement, RoomMenuProps>(({ room, requestClose }, ref) => {
|
||||
const mx = useMatrixClient();
|
||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const [hideReads] = useSetting(settingsAtom, 'hideReads');
|
||||
const unread = useRoomUnread(room.roomId, roomToUnreadAtom);
|
||||
const powerLevels = usePowerLevelsContext();
|
||||
const creators = useRoomCreators(room);
|
||||
@@ -123,7 +123,7 @@ const RoomMenu = forwardRef<HTMLDivElement, RoomMenuProps>(({ room, requestClose
|
||||
const [directInvitePrompt, setDirectInvitePrompt] = useState(false);
|
||||
|
||||
const handleMarkAsRead = () => {
|
||||
markAsRead(mx, room.roomId, hideActivity);
|
||||
markAsRead(mx, room.roomId, hideReads);
|
||||
requestClose();
|
||||
};
|
||||
|
||||
|
||||
@@ -404,6 +404,7 @@ function Editor({ isMobile }: { isMobile: boolean }) {
|
||||
const [enterForNewline, setEnterForNewline] = useSetting(settingsAtom, 'enterForNewline');
|
||||
const [isMarkdown, setIsMarkdown] = useSetting(settingsAtom, 'isMarkdown');
|
||||
const [hideActivity, setHideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const [hideReads, setHideReads] = useSetting(settingsAtom, 'hideReads');
|
||||
|
||||
return (
|
||||
<Box direction="Column" gap="100">
|
||||
@@ -435,11 +436,18 @@ function Editor({ isMobile }: { isMobile: boolean }) {
|
||||
</SequenceCard>
|
||||
<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
|
||||
<SettingTile
|
||||
title="Hide Typing & Read Receipts"
|
||||
description="Turn off both typing status and read receipts to keep your activity private."
|
||||
title="Hide Typing Indicators"
|
||||
description="Turn off typing status."
|
||||
after={<Switch variant="Primary" value={hideActivity} onChange={setHideActivity} />}
|
||||
/>
|
||||
</SequenceCard>
|
||||
<SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
|
||||
<SettingTile
|
||||
title="Hide Read Receipts"
|
||||
description="Turn off read receipts."
|
||||
after={<Switch variant="Primary" value={hideReads} onChange={setHideReads} />}
|
||||
/>
|
||||
</SequenceCard>
|
||||
</Box>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -35,8 +35,8 @@ interface CallContextState {
|
||||
registerActiveClientWidgetApi: (
|
||||
roomId: string | null,
|
||||
clientWidgetApi: ClientWidgetApi | null,
|
||||
clientWidget: SmallWidget,
|
||||
activeClientIframeRef: HTMLIFrameElement
|
||||
clientWidget: SmallWidget | null,
|
||||
activeClientIframeRef: HTMLIFrameElement | null
|
||||
) => void;
|
||||
sendWidgetAction: <T extends IWidgetApiRequestData = IWidgetApiRequestData>(
|
||||
action: WidgetApiToWidgetAction | string,
|
||||
@@ -46,6 +46,7 @@ interface CallContextState {
|
||||
isVideoEnabled: boolean;
|
||||
isChatOpen: boolean;
|
||||
isActiveCallReady: boolean;
|
||||
resetActiveCallReady: () => void;
|
||||
toggleAudio: () => Promise<void>;
|
||||
toggleVideo: () => Promise<void>;
|
||||
toggleChat: () => Promise<void>;
|
||||
@@ -280,6 +281,10 @@ export function CallProvider({ children }: CallProviderProps) {
|
||||
sendWidgetAction,
|
||||
]);
|
||||
|
||||
const resetActiveCallReady = useCallback(() => {
|
||||
setIsActiveCallReady(false);
|
||||
}, []);
|
||||
|
||||
const toggleChat = useCallback(async () => {
|
||||
const newState = !isChatOpen;
|
||||
setIsChatOpenState(newState);
|
||||
@@ -300,6 +305,7 @@ export function CallProvider({ children }: CallProviderProps) {
|
||||
isAudioEnabled,
|
||||
isVideoEnabled,
|
||||
isActiveCallReady,
|
||||
resetActiveCallReady,
|
||||
toggleAudio,
|
||||
toggleVideo,
|
||||
toggleChat,
|
||||
@@ -318,6 +324,7 @@ export function CallProvider({ children }: CallProviderProps) {
|
||||
isAudioEnabled,
|
||||
isVideoEnabled,
|
||||
isActiveCallReady,
|
||||
resetActiveCallReady,
|
||||
toggleAudio,
|
||||
toggleVideo,
|
||||
toggleChat,
|
||||
|
||||
@@ -8,12 +8,14 @@ import {
|
||||
useRef,
|
||||
} from 'react';
|
||||
import { ClientWidgetApi } from 'matrix-widget-api';
|
||||
import { MatrixRTCSession } from 'matrix-js-sdk/lib/matrixrtc/MatrixRTCSession';
|
||||
import { Box } from 'folds';
|
||||
import {
|
||||
createVirtualWidget,
|
||||
SmallWidget,
|
||||
getWidgetData,
|
||||
getWidgetUrl,
|
||||
getCallIntentParams,
|
||||
} from '$features/call/SmallWidget';
|
||||
import { useMatrixClient } from '$hooks/useMatrixClient';
|
||||
import { useClientConfig } from '$hooks/useClientConfig';
|
||||
@@ -33,6 +35,9 @@ export function PersistentCallContainer({ children }: PersistentCallContainerPro
|
||||
const callIframeRef = useRef<HTMLIFrameElement | null>(null);
|
||||
const callWidgetApiRef = useRef<ClientWidgetApi | null>(null);
|
||||
const callSmallWidgetRef = useRef<SmallWidget | null>(null);
|
||||
// After any lobby join, reload EC with join_existing for proper in-call view.
|
||||
const hasReloadedAfterLobbyRef = useRef(false);
|
||||
const postLobbyIntentRef = useRef<'join_existing' | null>(null);
|
||||
|
||||
const {
|
||||
activeCallRoomId,
|
||||
@@ -41,6 +46,8 @@ export function PersistentCallContainer({ children }: PersistentCallContainerPro
|
||||
isActiveCallReady,
|
||||
registerActiveClientWidgetApi,
|
||||
activeClientWidget,
|
||||
resetActiveCallReady,
|
||||
hangUp,
|
||||
} = useCallState();
|
||||
const mx = useMatrixClient();
|
||||
const clientConfig = useClientConfig();
|
||||
@@ -56,11 +63,15 @@ export function PersistentCallContainer({ children }: PersistentCallContainerPro
|
||||
smallWidgetRef: MutableRefObject<SmallWidget | null>,
|
||||
iframeRef: MutableRefObject<HTMLIFrameElement | null>,
|
||||
skipLobby: boolean,
|
||||
themeKind: ThemeKind | null
|
||||
themeKind: ThemeKind | null,
|
||||
intentOverride?: 'join_existing'
|
||||
) => {
|
||||
if (mx?.getUserId()) {
|
||||
if (activeCallRoomId && !isActiveCallReady) {
|
||||
const roomIdToSet = activeCallRoomId;
|
||||
const room = mx.getRoom(roomIdToSet);
|
||||
const { intent: intentParam, callIntentParam } = getCallIntentParams(room);
|
||||
const effectiveIntent = intentOverride ?? intentParam;
|
||||
|
||||
const widgetId = `element-call-${roomIdToSet}-${Date.now()}`;
|
||||
const newUrl = getWidgetUrl(
|
||||
@@ -69,11 +80,12 @@ export function PersistentCallContainer({ children }: PersistentCallContainerPro
|
||||
clientConfig.elementCallUrl ?? '',
|
||||
widgetId,
|
||||
{
|
||||
skipLobby: skipLobby.toString(),
|
||||
skipLobby: (intentOverride === 'join_existing' ? true : skipLobby).toString(),
|
||||
returnToLobby: 'true',
|
||||
perParticipantE2EE: 'true',
|
||||
theme: themeKind,
|
||||
callIntent: 'audio',
|
||||
intent: effectiveIntent,
|
||||
callIntent: callIntentParam,
|
||||
}
|
||||
);
|
||||
|
||||
@@ -106,7 +118,12 @@ export function PersistentCallContainer({ children }: PersistentCallContainerPro
|
||||
'm.call',
|
||||
newUrl,
|
||||
false,
|
||||
getWidgetData(mx, roomIdToSet, {}, { skipLobby: true, callIntent: 'audio' }),
|
||||
getWidgetData(
|
||||
mx,
|
||||
roomIdToSet,
|
||||
{},
|
||||
{ skipLobby: true, intent: effectiveIntent, callIntent: callIntentParam }
|
||||
),
|
||||
roomIdToSet
|
||||
);
|
||||
|
||||
@@ -134,9 +151,62 @@ export function PersistentCallContainer({ children }: PersistentCallContainerPro
|
||||
]
|
||||
);
|
||||
|
||||
// After any lobby join, poll until EC's call member state event has propagated to the room,
|
||||
// then reload EC with intent=join_existing + skipLobby=true so it auto-joins the existing
|
||||
// session and shows the full in-call grid. Hangs up if the session never appears.
|
||||
// Applies to all room types: DM/group (start_call) and voice rooms (join_existing) both
|
||||
// hit the same timing issue where the in-call grid is not shown after the first join.
|
||||
useEffect(() => {
|
||||
if (!activeCallRoomId) {
|
||||
hasReloadedAfterLobbyRef.current = false;
|
||||
return undefined;
|
||||
}
|
||||
if (isActiveCallReady && !hasReloadedAfterLobbyRef.current) {
|
||||
const room = mx?.getRoom(activeCallRoomId);
|
||||
if (room) {
|
||||
hasReloadedAfterLobbyRef.current = true;
|
||||
const POLL_INTERVAL_MS = 200;
|
||||
const TIMEOUT_MS = 10000;
|
||||
const startTime = Date.now();
|
||||
const pollTimer = setInterval(() => {
|
||||
if (MatrixRTCSession.callMembershipsForRoom(room).length > 0) {
|
||||
clearInterval(pollTimer);
|
||||
callSmallWidgetRef.current?.stopMessaging();
|
||||
callWidgetApiRef.current = null;
|
||||
callSmallWidgetRef.current = null;
|
||||
registerActiveClientWidgetApi(activeCallRoomId, null, null, null);
|
||||
postLobbyIntentRef.current = 'join_existing';
|
||||
resetActiveCallReady();
|
||||
} else if (Date.now() - startTime >= TIMEOUT_MS) {
|
||||
clearInterval(pollTimer);
|
||||
hangUp();
|
||||
}
|
||||
}, POLL_INTERVAL_MS);
|
||||
return () => clearInterval(pollTimer);
|
||||
}
|
||||
}
|
||||
return undefined;
|
||||
}, [
|
||||
isActiveCallReady,
|
||||
activeCallRoomId,
|
||||
mx,
|
||||
registerActiveClientWidgetApi,
|
||||
resetActiveCallReady,
|
||||
hangUp,
|
||||
]);
|
||||
|
||||
useEffect(() => {
|
||||
if (activeCallRoomId) {
|
||||
setupWidget(callWidgetApiRef, callSmallWidgetRef, callIframeRef, true, theme.kind);
|
||||
const intentOverride = postLobbyIntentRef.current ?? undefined;
|
||||
postLobbyIntentRef.current = null;
|
||||
setupWidget(
|
||||
callWidgetApiRef,
|
||||
callSmallWidgetRef,
|
||||
callIframeRef,
|
||||
true,
|
||||
theme.kind,
|
||||
intentOverride
|
||||
);
|
||||
}
|
||||
}, [
|
||||
theme,
|
||||
|
||||
@@ -58,13 +58,13 @@ type DirectMenuProps = {
|
||||
};
|
||||
const DirectMenu = forwardRef<HTMLDivElement, DirectMenuProps>(({ requestClose }, ref) => {
|
||||
const mx = useMatrixClient();
|
||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const [hideReads] = useSetting(settingsAtom, 'hideReads');
|
||||
const orphanRooms = useDirectRooms();
|
||||
const unread = useRoomsUnread(orphanRooms, roomToUnreadAtom);
|
||||
|
||||
const handleMarkAsRead = () => {
|
||||
if (!unread) return;
|
||||
orphanRooms.forEach((rId) => markAsRead(mx, rId, hideActivity));
|
||||
orphanRooms.forEach((rId) => markAsRead(mx, rId, hideReads));
|
||||
requestClose();
|
||||
};
|
||||
|
||||
|
||||
@@ -69,13 +69,13 @@ type HomeMenuProps = {
|
||||
};
|
||||
const HomeMenu = forwardRef<HTMLDivElement, HomeMenuProps>(({ requestClose }, ref) => {
|
||||
const orphanRooms = useHomeRooms();
|
||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const [hideReads] = useSetting(settingsAtom, 'hideReads');
|
||||
const unread = useRoomsUnread(orphanRooms, roomToUnreadAtom);
|
||||
const mx = useMatrixClient();
|
||||
|
||||
const handleMarkAsRead = () => {
|
||||
if (!unread) return;
|
||||
orphanRooms.forEach((rId) => markAsRead(mx, rId, hideActivity));
|
||||
orphanRooms.forEach((rId) => markAsRead(mx, rId, hideReads));
|
||||
requestClose();
|
||||
};
|
||||
|
||||
|
||||
@@ -207,7 +207,7 @@ type RoomNotificationsGroupProps = {
|
||||
notifications: INotification[];
|
||||
mediaAutoLoad?: boolean;
|
||||
urlPreview?: boolean;
|
||||
hideActivity: boolean;
|
||||
hideReads: boolean;
|
||||
onOpen: (roomId: string, eventId: string) => void;
|
||||
legacyUsernameColor?: boolean;
|
||||
hour24Clock: boolean;
|
||||
@@ -218,7 +218,7 @@ function RoomNotificationsGroupComp({
|
||||
notifications,
|
||||
mediaAutoLoad,
|
||||
urlPreview,
|
||||
hideActivity,
|
||||
hideReads,
|
||||
onOpen,
|
||||
legacyUsernameColor,
|
||||
hour24Clock,
|
||||
@@ -414,7 +414,7 @@ function RoomNotificationsGroupComp({
|
||||
onOpen(room.roomId, eventId);
|
||||
};
|
||||
const handleMarkAsRead = () => {
|
||||
markAsRead(mx, room.roomId, hideActivity);
|
||||
markAsRead(mx, room.roomId, hideReads);
|
||||
};
|
||||
|
||||
return (
|
||||
@@ -565,7 +565,7 @@ const FAST_REFRESH_MS = 2500;
|
||||
|
||||
export function Notifications() {
|
||||
const mx = useMatrixClient();
|
||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const [hideReads] = useSetting(settingsAtom, 'hideReads');
|
||||
const [mediaAutoLoad] = useSetting(settingsAtom, 'mediaAutoLoad');
|
||||
const [urlPreview] = useSetting(settingsAtom, 'urlPreview');
|
||||
const [legacyUsernameColor] = useSetting(settingsAtom, 'legacyUsernameColor');
|
||||
@@ -720,7 +720,7 @@ export function Notifications() {
|
||||
notifications={group.notifications}
|
||||
mediaAutoLoad={mediaAutoLoad}
|
||||
urlPreview={urlPreview}
|
||||
hideActivity={hideActivity}
|
||||
hideReads={hideReads}
|
||||
onOpen={navigateRoom}
|
||||
legacyUsernameColor={
|
||||
legacyUsernameColor || mDirects.has(groupRoom.roomId)
|
||||
|
||||
@@ -31,13 +31,13 @@ type DirectMenuProps = {
|
||||
};
|
||||
const DirectMenu = forwardRef<HTMLDivElement, DirectMenuProps>(({ requestClose }, ref) => {
|
||||
const orphanRooms = useDirectRooms();
|
||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const [hideReads] = useSetting(settingsAtom, 'hideReads');
|
||||
const unread = useRoomsUnread(orphanRooms, roomToUnreadAtom);
|
||||
const mx = useMatrixClient();
|
||||
|
||||
const handleMarkAsRead = () => {
|
||||
if (!unread) return;
|
||||
orphanRooms.forEach((rId) => markAsRead(mx, rId, hideActivity));
|
||||
orphanRooms.forEach((rId) => markAsRead(mx, rId, hideReads));
|
||||
requestClose();
|
||||
};
|
||||
|
||||
|
||||
@@ -32,13 +32,13 @@ type HomeMenuProps = {
|
||||
};
|
||||
const HomeMenu = forwardRef<HTMLDivElement, HomeMenuProps>(({ requestClose }, ref) => {
|
||||
const orphanRooms = useHomeRooms();
|
||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const [hideReads] = useSetting(settingsAtom, 'hideReads');
|
||||
const unread = useRoomsUnread(orphanRooms, roomToUnreadAtom);
|
||||
const mx = useMatrixClient();
|
||||
|
||||
const handleMarkAsRead = () => {
|
||||
if (!unread) return;
|
||||
orphanRooms.forEach((rId) => markAsRead(mx, rId, hideActivity));
|
||||
orphanRooms.forEach((rId) => markAsRead(mx, rId, hideReads));
|
||||
requestClose();
|
||||
};
|
||||
|
||||
|
||||
@@ -102,7 +102,7 @@ type SpaceMenuProps = {
|
||||
const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(
|
||||
({ room, requestClose, onUnpin }, ref) => {
|
||||
const mx = useMatrixClient();
|
||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const [hideReads] = useSetting(settingsAtom, 'hideReads');
|
||||
const roomToParents = useAtomValue(roomToParentsAtom);
|
||||
const powerLevels = usePowerLevels(room);
|
||||
const creators = useRoomCreators(room);
|
||||
@@ -121,7 +121,7 @@ const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(
|
||||
const unread = useRoomsUnread(allChild, roomToUnreadAtom);
|
||||
|
||||
const handleMarkAsRead = () => {
|
||||
allChild.forEach((childRoomId) => markAsRead(mx, childRoomId, hideActivity));
|
||||
allChild.forEach((childRoomId) => markAsRead(mx, childRoomId, hideReads));
|
||||
requestClose();
|
||||
};
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@ type SpaceMenuProps = {
|
||||
};
|
||||
const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(({ room, requestClose }, ref) => {
|
||||
const mx = useMatrixClient();
|
||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||
const [hideReads] = useSetting(settingsAtom, 'hideReads');
|
||||
const [developerTools] = useSetting(settingsAtom, 'developerTools');
|
||||
const roomToParents = useAtomValue(roomToParentsAtom);
|
||||
const powerLevels = usePowerLevels(room);
|
||||
@@ -101,7 +101,7 @@ const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(({ room, requestClo
|
||||
const unread = useRoomsUnread(allChild, roomToUnreadAtom);
|
||||
|
||||
const handleMarkAsRead = () => {
|
||||
allChild.forEach((childRoomId) => markAsRead(mx, childRoomId, hideActivity));
|
||||
allChild.forEach((childRoomId) => markAsRead(mx, childRoomId, hideReads));
|
||||
requestClose();
|
||||
};
|
||||
|
||||
|
||||
@@ -78,6 +78,7 @@ export interface Settings {
|
||||
showUnreadCounts: boolean;
|
||||
badgeCountDMsOnly: boolean;
|
||||
showPingCounts: boolean;
|
||||
hideReads: boolean;
|
||||
}
|
||||
|
||||
const defaultSettings: Settings = {
|
||||
@@ -142,6 +143,7 @@ const defaultSettings: Settings = {
|
||||
showUnreadCounts: true,
|
||||
badgeCountDMsOnly: false,
|
||||
showPingCounts: true,
|
||||
hideReads: false,
|
||||
};
|
||||
|
||||
export const getSettings = () => {
|
||||
|
||||
Reference in new issue
Block a user