Merge remote-tracking branch 'origin/lotus' into fix/call-disconnected-bar

# Conflicts:
#	src/app/components/CallEmbedProvider.tsx

src/app/hooks/useCallRejoin.ts

@@ -17,6 +17,8 @@ import {
   CALL_SESSION_HEARTBEAT_MS,
   clearCallSession,
   decideRejoin,
+  othersInCall,
+  rejoinToastBody,
   readCallSession,
   writeCallSession,
 } from '../utils/callRejoin';
@@ -112,6 +114,27 @@ export function useCallRejoin(embed: CallEmbed | undefined, joined: boolean): vo
       };
       dismissToast(TOAST_ID);
       clearCallSession();
+      // [Gitea #302] A DM call the other person has since left is over;
+      // starting it again would ring them, so just say so.
+      const dm = l.directs.has(room.roomId);
+      if (
+        dm &&
+        !othersInCall(
+          session.memberships.map((m) => m.userId ?? ''),
+          mx.getUserId() ?? '',
+        )
+      ) {
+        // Own id: clicking a toast removes it by id after its onClick runs.
+        setToast({
+          id: `${TOAST_ID}-ended`,
+          iconSrc: Icons.Phone,
+          displayName: 'Call ended',
+          body: `${room.name ?? 'They'} already left the call.`,
+          roomName: room.name ?? '',
+          roomId: room.roomId,
+        });
+        return;
+      }
       try {
         (l.directs.has(room.roomId) ? l.startDmCall : l.startRoomCall)(room, pref);
       } catch {
@@ -133,6 +156,7 @@ export function useCallRejoin(embed: CallEmbed | undefined, joined: boolean): vo
           .filter((m) => m.userId === mx.getUserId())
           .map((m) => m.deviceId),
         memberCount: memberships.length,
+        dm: latest.current.directs.has(room.roomId),
       });
       // The RTC session fills in a moment after sync; keep waiting while it is
       // empty unless this is the final (timed-out) look.
@@ -152,7 +176,7 @@ export function useCallRejoin(embed: CallEmbed | undefined, joined: boolean): vo
         id: TOAST_ID,
         iconSrc: Icons.Phone,
         displayName: 'Rejoin voice?',
-        body: `You were in the call in ${room.name ?? 'a room'} before the restart. Tap to rejoin.`,
+        body: rejoinToastBody(room.name, latest.current.directs.has(room.roomId)),
         roomName: room.name ?? '',
         roomId: room.roomId,
         sticky: true,

src/app/hooks/useDenoiseNotices.ts

@@ -0,0 +1,38 @@
+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],
+  );
+}

src/app/hooks/useHomeserverStall.test.ts

@@ -0,0 +1,16 @@
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { SyncState } from 'matrix-js-sdk';
+import { STALL_AFTER_MS, syncOverdue } from './useHomeserverStall';
+
+test('syncOverdue: only while SYNCING and past the stall threshold (#317)', () => {
+  const now = 1_000_000;
+  assert.equal(syncOverdue(now - STALL_AFTER_MS - 1, now, SyncState.Syncing), true);
+  assert.equal(syncOverdue(now - 20_000, now, SyncState.Syncing), false, 'a normal long-poll');
+  assert.equal(
+    syncOverdue(now - 120_000, now, SyncState.Reconnecting),
+    false,
+    'SyncStatus already shows that',
+  );
+  assert.equal(syncOverdue(now - 120_000, now, null), false);
+});

src/app/hooks/useHomeserverStall.ts

@@ -0,0 +1,57 @@
+import { useEffect, useState } from 'react';
+import { atom } from 'jotai';
+import { ClientEvent, MatrixClient, SyncState } from 'matrix-js-sdk';
+
+/**
+ * [Gitea #317] A hung homeserver (accepts connections, never answers) went
+ * unnoticed for up to 110 s: the SDK only gives up on a /sync long-poll after
+ * pollTimeout (30 s) + an 80 s buffer, and until then the sync state stays
+ * SYNCING, so no strip showed and Kuma wasn't asked. This watchdog notices a
+ * /sync that's overdue and confirms with a short probe of /versions.
+ */
+export const STALL_AFTER_MS = 45_000; // a healthy long-poll returns within ~30 s
+const CHECK_EVERY_MS = 10_000;
+const PROBE_TIMEOUT_MS = 5_000;
+
+export const homeserverStalledAtom = atom(false);
+
+/** Pure: should we probe, given the last sync response time? */
+export const syncOverdue = (lastSyncAt: number, now: number, state: SyncState | null): boolean =>
+  state === SyncState.Syncing && now - lastSyncAt > STALL_AFTER_MS;
+
+export function useHomeserverStall(mx: MatrixClient): boolean {
+  const [stalled, setStalled] = useState(false);
+  useEffect(() => {
+    let lastSyncAt = Date.now();
+    let probing = false;
+    const onSync = () => {
+      lastSyncAt = Date.now();
+      setStalled(false);
+    };
+    const check = async () => {
+      if (probing || !syncOverdue(lastSyncAt, Date.now(), mx.getSyncState())) return;
+      probing = true;
+      let answered = false;
+      try {
+        const res = await fetch(`${mx.getHomeserverUrl()}/_matrix/client/versions`, {
+          cache: 'no-store',
+          signal: AbortSignal.timeout(PROBE_TIMEOUT_MS),
+        });
+        answered = res.ok;
+      } catch {
+        answered = false;
+      }
+      probing = false;
+      // Still overdue and the server didn't answer a trivial request: stalled.
+      if (!answered && syncOverdue(lastSyncAt, Date.now(), mx.getSyncState())) setStalled(true);
+      if (answered) setStalled(false);
+    };
+    mx.on(ClientEvent.Sync, onSync);
+    const id = setInterval(check, CHECK_EVERY_MS);
+    return () => {
+      mx.removeListener(ClientEvent.Sync, onSync);
+      clearInterval(id);
+    };
+  }, [mx]);
+  return stalled;
+}

src/app/hooks/useMessageTranslation.ts

@@ -12,7 +12,8 @@ import {
   markAutoTranslateTried,
 } from '../state/translation';
 import { chromeTranslationEngine as engine } from '../utils/translation/chromeEngine';
-import { sameLanguage } from '../utils/translation/langUtils';
+import { sameLanguage, translateSkipMessage } from '../utils/translation/langUtils';
+import { toastQueueAtom } from '../state/toast';
 
 export type MsgTranslationStatus =
   | 'idle' // not translating (original shown)
@@ -52,6 +53,7 @@ export const useMessageTranslation = (eventId: string, text: string): MsgTransla
   // Write-only: reading the whole cache array here (via useAtom) would
   // resubscribe this message to every other message's writes. [Gitea #39]
   const setCache = useSetAtom(translationCacheAtom);
+  const setToast = useSetAtom(toastQueueAtom);
 
   // The key includes a fingerprint of `text`, so an edit (same event id, new
   // body) misses the old entry and re-translates instead of showing stale
@@ -124,6 +126,16 @@ export const useMessageTranslation = (eventId: string, text: string): MsgTransla
         if (!from || sameLanguage(from, targetLang)) {
           setStatus('skipped');
           setActive(false);
+          // [Gitea #287] Say why nothing happened instead of silently undoing
+          // the click (no chip shows once translation is switched back off).
+          setToast({
+            id: `translate-skipped-${eventId}-${Date.now()}`,
+            displayName: 'Translate',
+            body: translateSkipMessage(from, targetLang),
+            roomName: '',
+            roomId: '',
+            onClick: () => undefined,
+          });
           return;
         }
         setFromLang(from);
@@ -154,7 +166,7 @@ export const useMessageTranslation = (eventId: string, text: string): MsgTransla
       // Invalidate this run's writes if inputs change / unmount.
       runIdRef.current += 1;
     };
-  }, [active, cached, supported, text, targetLang, key, setActive, setCache]);
+  }, [active, cached, supported, text, targetLang, key, setActive, setCache, setToast, eventId]);
 
   // When switched off, drop back to idle (keep the cached translation around so
   // toggling back on is instant).

src/app/hooks/useScreenshareNotices.test.ts

@@ -0,0 +1,10 @@
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { shouldShowScreenshareNotice } from './useScreenshareNotices';
+
+test('shouldShowScreenshareNotice: no "window was closed" when an admin turned sharing off (#297)', () => {
+  assert.equal(shouldShowScreenshareNotice('ended', false), false);
+  assert.equal(shouldShowScreenshareNotice('ended', true), true);
+  assert.equal(shouldShowScreenshareNotice('no-frames', false), true);
+  assert.equal(shouldShowScreenshareNotice('alone', true), true);
+});

src/app/hooks/useScreenshareNotices.ts

@@ -1,8 +1,9 @@
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 import { useSetAtom } from 'jotai';
 import { Icons } from 'folds';
 import { CallEmbed } from '../plugins/call';
 import { toastQueueAtom } from '../state/toast';
+import { useRoomCallPolicy } from './useRoomCallPolicy';
 
 export type ScreenshareNoticeKind = 'ended' | 'no-frames' | 'alone';
 
@@ -19,18 +20,32 @@ export const describeScreenshareNotice = (kind: ScreenshareNoticeKind): string |
   }
 };
 
+/** Pure: a policy-forced stop is explained by its own toast (#297). */
+export const shouldShowScreenshareNotice = (
+  kind: ScreenshareNoticeKind,
+  allowScreenshare: boolean,
+): boolean => !(kind === 'ended' && !allowScreenshare);
+
 /**
  * [Gitea EC#39] Toast the fork's io.lotus.screenshare_notice: shared window
  * closed, no frames for a while, or a long share with nobody watching.
  */
 export function useScreenshareNotices(embed: CallEmbed): void {
   const setToast = useSetAtom(toastQueueAtom);
+  // [Gitea #297] When a room admin turns screen sharing off, the share ends
+  // and the fork reports `ended` ("the shared window was closed"), which is
+  // wrong; useCallPolicyRevokedToast already says what happened.
+  const { allowScreenshare } = useRoomCallPolicy(embed.room);
+  const allowRef = useRef(allowScreenshare);
+  allowRef.current = allowScreenshare;
   useEffect(
     () =>
       embed.listenAction<{ data?: { kind?: ScreenshareNoticeKind } }>(
         'io.lotus.screenshare_notice',
         (evt) => {
-          const body = describeScreenshareNotice(evt.detail?.data?.kind as ScreenshareNoticeKind);
+          const kind = evt.detail?.data?.kind as ScreenshareNoticeKind;
+          if (!shouldShowScreenshareNotice(kind, allowRef.current)) return;
+          const body = describeScreenshareNotice(kind);
           if (!body) return;
           setToast({
             id: `screenshare-${evt.detail?.data?.kind}-${Date.now()}`,

src/app/hooks/useStrippedFilePicker.ts

@@ -0,0 +1,36 @@
+import { useCallback } from 'react';
+import { useFilePicker } from './useFilePicker';
+import { useSetting } from '../state/hooks/settings';
+import { settingsAtom } from '../state/settings';
+import { stripImageMetadata } from '../utils/stripImageMetadata';
+
+/**
+ * [Gitea #332] `useFilePicker` for images that get published (emoji / sticker
+ * packs, pack avatars, power-level badges): applies "Remove Photo Metadata"
+ * like message attachments and avatars, so a phone photo's GPS location and
+ * timestamp don't go to every member of the room or space.
+ */
+export const useStrippedFilePicker = <M extends boolean | undefined = undefined>(
+  onSelect: (file: M extends true ? File[] : File) => void,
+  multiple?: M,
+) => {
+  const [strip] = useSetting(settingsAtom, 'stripImageMetadata');
+  const handle = useCallback(
+    (picked: File | File[]) => {
+      if (!strip) {
+        onSelect(picked as M extends true ? File[] : File);
+        return;
+      }
+      const clean = (f: File) => stripImageMetadata(f).then((r) => r.file);
+      if (Array.isArray(picked)) {
+        Promise.all(picked.map(clean)).then((files) =>
+          onSelect(files as M extends true ? File[] : File),
+        );
+      } else {
+        clean(picked).then((file) => onSelect(file as M extends true ? File[] : File));
+      }
+    },
+    [strip, onSelect],
+  );
+  return useFilePicker(handle as (file: M extends true ? File[] : File) => void, multiple);
+};