Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6f7a8f64e2 |
@@ -86,7 +86,6 @@ import { CallAvatarAnimation } from '../styles/Animations.css';
|
|||||||
import { webRTCSupported } from '../utils/rtc';
|
import { webRTCSupported } from '../utils/rtc';
|
||||||
import { CallsUnavailableMessage } from '../features/call/CallsUnavailable';
|
import { CallsUnavailableMessage } from '../features/call/CallsUnavailable';
|
||||||
import { zIndices } from '../styles/zIndex';
|
import { zIndices } from '../styles/zIndex';
|
||||||
import { useDenoiseNotices } from '../hooks/useDenoiseNotices';
|
|
||||||
|
|
||||||
const PIP_MIN_W = 200;
|
const PIP_MIN_W = 200;
|
||||||
const PIP_MIN_H = 112;
|
const PIP_MIN_H = 112;
|
||||||
@@ -794,7 +793,6 @@ function CallUtils({ embed, joined }: { embed: CallEmbed; joined: boolean }) {
|
|||||||
useCallPolicyRevokedToast(embed, joined);
|
useCallPolicyRevokedToast(embed, joined);
|
||||||
useCallEndedToast(embed);
|
useCallEndedToast(embed);
|
||||||
useScreenshareNotices(embed);
|
useScreenshareNotices(embed);
|
||||||
useDenoiseNotices(embed);
|
|
||||||
// [Gitea #43] The in-frame screenshare button follows the same room policy
|
// [Gitea #43] The in-frame screenshare button follows the same room policy
|
||||||
// as the host bar's (hidden where the server would refuse the share).
|
// as the host bar's (hidden where the server would refuse the share).
|
||||||
const { allowScreenshare } = useRoomCallPolicy(embed.room);
|
const { allowScreenshare } = useRoomCallPolicy(embed.room);
|
||||||
|
|||||||
@@ -43,7 +43,9 @@ export function SettingTile({ title, description, before, after, children }: Set
|
|||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
{description && (
|
{description && (
|
||||||
<Text className={BreakWord} size="T200" priority="300">
|
// [Gitea #291] A <div>, not a <p>: many tiles pass blocks (badges,
|
||||||
|
// <Box>, <Text>) as the description, which is invalid inside a <p>.
|
||||||
|
<Text as="div" className={BreakWord} size="T200" priority="300">
|
||||||
{description}
|
{description}
|
||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -310,9 +310,13 @@ export function UploadCardRenderer({
|
|||||||
const { file } = upload;
|
const { file } = upload;
|
||||||
const fileSizeExceeded = file.size >= allowSize;
|
const fileSizeExceeded = file.size >= allowSize;
|
||||||
|
|
||||||
if (upload.status === UploadStatus.Idle && !fileSizeExceeded) {
|
// [Gitea #291] Start in an effect, not during render: the desktop taskbar
|
||||||
startUpload();
|
// progress hook subscribes to the upload atoms, so a render-time start
|
||||||
}
|
// updated another component mid-render (React warning on every image send).
|
||||||
|
const idle = upload.status === UploadStatus.Idle;
|
||||||
|
useEffect(() => {
|
||||||
|
if (idle && !fileSizeExceeded) startUpload();
|
||||||
|
}, [idle, fileSizeExceeded, startUpload]);
|
||||||
|
|
||||||
const handleSpoiler = (marked: boolean) => {
|
const handleSpoiler = (marked: boolean) => {
|
||||||
setMetadata(fileItem, { ...metadata, markedAsSpoiler: marked });
|
setMetadata(fileItem, { ...metadata, markedAsSpoiler: marked });
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
import { useEffect, useRef } from 'react';
|
|
||||||
import { useSetAtom } from 'jotai';
|
|
||||||
import { Icons } from 'folds';
|
|
||||||
import { CallEmbed } from '../plugins/call';
|
|
||||||
import { toastQueueAtom } from '../state/toast';
|
|
||||||
import { useSetting } from '../state/hooks/settings';
|
|
||||||
import { settingsAtom } from '../state/settings';
|
|
||||||
import { denoiseNotice, DenoiseStateReport } from '../utils/denoiseNotice';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [Gitea #260] Tell the user when ML noise suppression didn't attach (raw mic)
|
|
||||||
* or fell back to another model. The fork's `io.lotus.denoise_state` used to
|
|
||||||
* go unanswered ("unsupported action"), so failures were silent.
|
|
||||||
*/
|
|
||||||
export function useDenoiseNotices(embed: CallEmbed): void {
|
|
||||||
const setToast = useSetAtom(toastQueueAtom);
|
|
||||||
const [mode] = useSetting(settingsAtom, 'callNoiseSuppression');
|
|
||||||
const [model] = useSetting(settingsAtom, 'callDenoiseModel');
|
|
||||||
const latest = useRef({ mode, model });
|
|
||||||
latest.current = { mode, model };
|
|
||||||
useEffect(
|
|
||||||
() =>
|
|
||||||
embed.listenAction<{ data?: DenoiseStateReport }>('io.lotus.denoise_state', (evt) => {
|
|
||||||
if (latest.current.mode !== 'ml') return;
|
|
||||||
const body = denoiseNotice(latest.current.model, evt.detail?.data);
|
|
||||||
if (!body) return;
|
|
||||||
setToast({
|
|
||||||
id: `denoise-state-${Date.now()}`,
|
|
||||||
iconSrc: Icons.Mic,
|
|
||||||
displayName: 'Noise suppression',
|
|
||||||
body,
|
|
||||||
roomName: embed.room.name ?? 'Voice call',
|
|
||||||
roomId: embed.roomId,
|
|
||||||
});
|
|
||||||
}),
|
|
||||||
[embed, setToast],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1060,6 +1060,32 @@ function TauriUpdateFeature() {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function LotusDenoiseFeature() {
|
||||||
|
const setToast = useSetAtom(toastQueueAtom);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const handleMessage = (event: MessageEvent) => {
|
||||||
|
if (event.data?.type === 'lotus-denoise-status') {
|
||||||
|
const { active, error } = event.data;
|
||||||
|
if (!active) {
|
||||||
|
setToast({
|
||||||
|
id: `denoise-fail-${Date.now()}`,
|
||||||
|
displayName: 'Audio Quality',
|
||||||
|
body: `ML Noise Suppression failed: ${error || 'Unknown error'}. Falling back to raw mic.`,
|
||||||
|
roomName: 'System',
|
||||||
|
roomId: '',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
window.addEventListener('message', handleMessage);
|
||||||
|
return () => window.removeEventListener('message', handleMessage);
|
||||||
|
}, [setToast]);
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
// Registers the global `?` shortcut (ignored while typing) and renders the
|
// Registers the global `?` shortcut (ignored while typing) and renders the
|
||||||
// keyboard-shortcuts help dialog. Headless — the dialog self-gates on its atom.
|
// keyboard-shortcuts help dialog. Headless — the dialog self-gates on its atom.
|
||||||
function KeyboardShortcutsFeature() {
|
function KeyboardShortcutsFeature() {
|
||||||
@@ -1141,6 +1167,7 @@ export function ClientNonUIFeatures({ children }: ClientNonUIFeaturesProps) {
|
|||||||
<CloseBehaviorPrompt />
|
<CloseBehaviorPrompt />
|
||||||
<ConsentRequiredPrompt />
|
<ConsentRequiredPrompt />
|
||||||
<OutboxFeature />
|
<OutboxFeature />
|
||||||
|
<LotusDenoiseFeature />
|
||||||
<DeepLinkNavigator />
|
<DeepLinkNavigator />
|
||||||
<KeyboardShortcutsFeature />
|
<KeyboardShortcutsFeature />
|
||||||
{children}
|
{children}
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
import { test } from 'node:test';
|
|
||||||
import assert from 'node:assert/strict';
|
|
||||||
import { denoiseNotice } from './denoiseNotice';
|
|
||||||
|
|
||||||
test('denoiseNotice: says when ML is off or fell back (#260)', () => {
|
|
||||||
assert.equal(denoiseNotice('deepfilternet', { active: true, model: 'deepfilternet' }), undefined);
|
|
||||||
assert.match(
|
|
||||||
denoiseNotice('deepfilternet', { active: true, model: 'rnnoise' }) ?? '',
|
|
||||||
/^DeepFilterNet 3 couldn't start, so noise suppression is using RNNoise instead\.$/,
|
|
||||||
);
|
|
||||||
assert.match(
|
|
||||||
denoiseNotice('rnnoise', { active: false, error: 'boom' }) ?? '',
|
|
||||||
/unfiltered audio/,
|
|
||||||
);
|
|
||||||
assert.equal(denoiseNotice('rnnoise', undefined), undefined);
|
|
||||||
assert.equal(denoiseNotice('rnnoise', { model: 'x' }), undefined);
|
|
||||||
});
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
/**
|
|
||||||
* [Gitea #260] The fork reports what noise suppression actually runs as
|
|
||||||
* `io.lotus.denoise_state { active, model, error? }`. Pure: the toast text for
|
|
||||||
* a report, or undefined when what runs is what the user picked.
|
|
||||||
*/
|
|
||||||
export type DenoiseStateReport = { active?: unknown; model?: unknown; error?: unknown };
|
|
||||||
|
|
||||||
const MODEL_NAMES: Record<string, string> = {
|
|
||||||
rnnoise: 'RNNoise',
|
|
||||||
speex: 'Speex',
|
|
||||||
dtln: 'DTLN',
|
|
||||||
deepfilternet: 'DeepFilterNet 3',
|
|
||||||
};
|
|
||||||
const modelName = (m: unknown): string =>
|
|
||||||
typeof m === 'string' ? (MODEL_NAMES[m] ?? m) : 'the selected model';
|
|
||||||
|
|
||||||
export function denoiseNotice(
|
|
||||||
requestedModel: string,
|
|
||||||
report: DenoiseStateReport | undefined,
|
|
||||||
): string | undefined {
|
|
||||||
if (!report || typeof report.active !== 'boolean') return undefined;
|
|
||||||
if (!report.active) {
|
|
||||||
return `ML noise suppression couldn't start, so your microphone is sending unfiltered audio. You can pick another model in Settings → Calls.`;
|
|
||||||
}
|
|
||||||
if (typeof report.model === 'string' && report.model !== requestedModel) {
|
|
||||||
return `${modelName(requestedModel)} couldn't start, so noise suppression is using ${modelName(report.model)} instead.`;
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user