feat(calls): undeafen catch-up toast (#128)
CI / Build & Quality Checks (push) Successful in 1m59s
CI / Docker image build & smoke test (push) Skipped
CI / Secret scan (gitleaks) (push) Successful in 15s
CI / Trigger Desktop Build (push) Successful in 12s
CI / Playwright smoke (e2e) (push) Successful in 2m23s
CI / Build & Quality Checks (push) Successful in 1m59s
CI / Docker image build & smoke test (push) Skipped
CI / Secret scan (gitleaks) (push) Successful in 15s
CI / Trigger Desktop Build (push) Successful in 12s
CI / Playwright smoke (e2e) (push) Successful in 2m23s
On deafen the participant set is snapshotted; on undeafen it is diffed and, only if it changed and you were deafened for at least 10 s, one auto-dismissing toast says 'While you were deafened: Alice, Bob joined · Cole left' (names capped at 3 + N more). Rides the membership stream that already drives the join/leave sounds — no new subscriptions; PTT holds don't touch deafen so they can't trigger it. Verified headless: short deafen → nothing; bob leaves during an 11 s deafen → 'bob left'; long deafen with no change → nothing. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PPmy3tPq869XDW4njjVaKA
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
import { useCallback, useEffect, useRef } from 'react';
|
import { useCallback, useEffect, useRef } from 'react';
|
||||||
import { CallMembership } from 'matrix-js-sdk/lib/matrixrtc/CallMembership';
|
import { CallMembership } from 'matrix-js-sdk/lib/matrixrtc/CallMembership';
|
||||||
import { CallEmbed } from '../plugins/call';
|
import { useSetAtom } from 'jotai';
|
||||||
|
import { CallEmbed, useCallControlState } from '../plugins/call';
|
||||||
import { useSetting } from '../state/hooks/settings';
|
import { useSetting } from '../state/hooks/settings';
|
||||||
import { settingsAtom } from '../state/settings';
|
import { settingsAtom } from '../state/settings';
|
||||||
import { useMatrixClient } from './useMatrixClient';
|
import { useMatrixClient } from './useMatrixClient';
|
||||||
@@ -8,6 +9,9 @@ import { useCallMembersChange, useCallSession } from './useCall';
|
|||||||
import { useCallJoined } from './useCallEmbed';
|
import { useCallJoined } from './useCallEmbed';
|
||||||
import { playCallJoinSound, playCallLeaveSound } from '../utils/callSounds';
|
import { playCallJoinSound, playCallLeaveSound } from '../utils/callSounds';
|
||||||
import { createCallSoundDebouncer } from '../utils/callSoundDebounce';
|
import { createCallSoundDebouncer } from '../utils/callSoundDebounce';
|
||||||
|
import { toastQueueAtom } from '../state/toast';
|
||||||
|
import { DEAFEN_CATCHUP_MIN_MS, deafenCatchUpText } from '../utils/deafenCatchUp';
|
||||||
|
import { getMemberName } from '../utils/room';
|
||||||
|
|
||||||
const membershipKey = (m: CallMembership): string => `${m.sender}|${m.deviceId}`;
|
const membershipKey = (m: CallMembership): string => `${m.sender}|${m.deviceId}`;
|
||||||
const userOfKey = (key: string): string => key.slice(0, key.indexOf('|'));
|
const userOfKey = (key: string): string => key.slice(0, key.indexOf('|'));
|
||||||
@@ -30,6 +34,40 @@ export function useCallJoinLeaveSounds(embed: CallEmbed): void {
|
|||||||
const styleRef = useRef(style);
|
const styleRef = useRef(style);
|
||||||
styleRef.current = style;
|
styleRef.current = style;
|
||||||
|
|
||||||
|
// [Gitea #128] Undeafen catch-up: snapshot who is here when you deafen, diff
|
||||||
|
// when you undeafen, one toast if it changed and you were deafened ≥ 10 s.
|
||||||
|
// Rides the same membership stream as the sounds — no new subscriptions.
|
||||||
|
const { sound } = useCallControlState(embed.control);
|
||||||
|
const setToast = useSetAtom(toastQueueAtom);
|
||||||
|
const usersNow = useRef<Set<string>>(new Set());
|
||||||
|
const deafenedAt = useRef<{ at: number; users: Set<string> } | null>(null);
|
||||||
|
useEffect(() => {
|
||||||
|
if (!joined) {
|
||||||
|
deafenedAt.current = null;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!sound) {
|
||||||
|
if (!deafenedAt.current)
|
||||||
|
deafenedAt.current = { at: Date.now(), users: new Set(usersNow.current) };
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const snap = deafenedAt.current;
|
||||||
|
deafenedAt.current = null;
|
||||||
|
if (!snap || Date.now() - snap.at < DEAFEN_CATCHUP_MIN_MS) return;
|
||||||
|
const text = deafenCatchUpText(snap.users, usersNow.current, (u) =>
|
||||||
|
getMemberName(embed.room, u),
|
||||||
|
);
|
||||||
|
if (text) {
|
||||||
|
setToast({
|
||||||
|
id: `deafen-catchup-${Date.now()}`,
|
||||||
|
displayName: 'Lotus Chat',
|
||||||
|
body: text,
|
||||||
|
roomName: embed.room.name ?? 'Voice call',
|
||||||
|
roomId: embed.roomId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [sound, joined, embed, setToast]);
|
||||||
|
|
||||||
// One debouncer per joined call, so pending leave cues die with the call.
|
// One debouncer per joined call, so pending leave cues die with the call.
|
||||||
const debouncerRef = useRef<ReturnType<typeof createCallSoundDebouncer> | null>(null);
|
const debouncerRef = useRef<ReturnType<typeof createCallSoundDebouncer> | null>(null);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -62,6 +100,9 @@ export function useCallJoinLeaveSounds(embed: CallEmbed): void {
|
|||||||
const next = new Set(members.map(membershipKey));
|
const next = new Set(members.map(membershipKey));
|
||||||
const prev = prevKeysRef.current ?? next;
|
const prev = prevKeysRef.current ?? next;
|
||||||
prevKeysRef.current = next;
|
prevKeysRef.current = next;
|
||||||
|
usersNow.current = new Set(
|
||||||
|
Array.from(next, userOfKey).filter((u) => u !== mx.getSafeUserId()),
|
||||||
|
);
|
||||||
|
|
||||||
const debouncer = debouncerRef.current;
|
const debouncer = debouncerRef.current;
|
||||||
if (!joined || style === 'off' || !debouncer) return;
|
if (!joined || style === 'off' || !debouncer) return;
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { deafenCatchUpText } from './deafenCatchUp';
|
||||||
|
|
||||||
|
const name = (u: string) => u.slice(1, u.indexOf(':'));
|
||||||
|
|
||||||
|
test('no change → nothing; joins and leaves are listed, capped at 3 + N more', () => {
|
||||||
|
assert.equal(deafenCatchUpText(new Set(['@a:x']), new Set(['@a:x']), name), null);
|
||||||
|
assert.equal(
|
||||||
|
deafenCatchUpText(new Set(['@a:x', '@c:x']), new Set(['@a:x', '@b:x']), name),
|
||||||
|
'While you were deafened: b joined · c left',
|
||||||
|
);
|
||||||
|
assert.equal(
|
||||||
|
deafenCatchUpText(new Set(), new Set(['@a:x', '@b:x', '@c:x', '@d:x', '@e:x']), name),
|
||||||
|
'While you were deafened: a, b, c and 2 more joined',
|
||||||
|
);
|
||||||
|
});
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
/**
|
||||||
|
* [Gitea #128] "While you were deafened: Alice, Bob joined · Cole left".
|
||||||
|
* Pure diff + wording; the hook snapshots the participant set on deafen and
|
||||||
|
* calls this on undeafen.
|
||||||
|
*/
|
||||||
|
export const DEAFEN_CATCHUP_MIN_MS = 10_000;
|
||||||
|
const MAX_NAMES = 3;
|
||||||
|
|
||||||
|
const list = (names: string[]): string => {
|
||||||
|
const shown = names.slice(0, MAX_NAMES);
|
||||||
|
const more = names.length - shown.length;
|
||||||
|
return more > 0 ? `${shown.join(', ')} and ${more} more` : shown.join(', ');
|
||||||
|
};
|
||||||
|
|
||||||
|
export const deafenCatchUpText = (
|
||||||
|
before: Set<string>,
|
||||||
|
after: Set<string>,
|
||||||
|
nameOf: (userId: string) => string,
|
||||||
|
): string | null => {
|
||||||
|
const joined = Array.from(after).filter((u) => !before.has(u));
|
||||||
|
const left = Array.from(before).filter((u) => !after.has(u));
|
||||||
|
if (joined.length === 0 && left.length === 0) return null;
|
||||||
|
const parts: string[] = [];
|
||||||
|
if (joined.length) parts.push(`${list(joined.map(nameOf))} joined`);
|
||||||
|
if (left.length) parts.push(`${list(left.map(nameOf))} left`);
|
||||||
|
return `While you were deafened: ${parts.join(' · ')}`;
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user