Merge branch 'lotus' into fix/translate-unavailable-copy

# Conflicts:
#	src/app/utils/translation/langUtils.ts

src/app/features/settings/account/Profile.tsx

@@ -67,7 +67,6 @@ import {
   makePresetId,
   normalizeLabel,
 } from '../../../utils/statusPresets';
-import { writeStatusExpiry } from '../../../utils/statusExpiry';
 
 type ProfileProps = {
   profile: UserProfile;
@@ -509,16 +508,12 @@ function ProfileStatus() {
       if (msg && delayMs > 0) {
         // Persist the expiry timestamp; the always-mounted StatusExpiryMonitor
         // (ClientNonUIFeatures) fires the auto-clear even when Settings is closed.
-        const expiresAt = Date.now() + delayMs;
-        localStorage.setItem(STATUS_EXPIRY_KEY(userId), String(expiresAt));
-        // [Gitea #300] …and on every other Lotus device, via account data.
-        writeStatusExpiry(mx, msg, expiresAt).catch(() => undefined);
+        localStorage.setItem(STATUS_EXPIRY_KEY(userId), String(Date.now() + delayMs));
       } else {
         localStorage.removeItem(STATUS_EXPIRY_KEY(userId));
-        writeStatusExpiry(mx, msg).catch(() => undefined);
       }
     },
-    [saveStatus, userId, mx],
+    [saveStatus, userId],
   );
 
   const handleSubmit: FormEventHandler<HTMLFormElement> = (evt) => {
@@ -558,7 +553,6 @@ function ProfileStatus() {
     setStatusMsg('');
     localStorage.removeItem(STATUS_MSG_KEY(userId));
     localStorage.removeItem(STATUS_EXPIRY_KEY(userId));
-    writeStatusExpiry(mx, '').catch(() => undefined);
     // Preserve the user's chosen presence when clearing the status message.
     mx.setPresence({
       presence: presenceStateFromSetting(presenceStatus, hidePresence),

src/app/features/settings/general/General.tsx

@@ -108,6 +108,7 @@ import {
   TRANSLATE_TARGET_LANGUAGES,
   normalizeLang,
   isSupportedTargetLang,
+  translationUnavailableText,
 } from '../../../utils/translation/langUtils';
 import { chromeTranslationEngine } from '../../../utils/translation/chromeEngine';
 import { SequenceCardStyle } from '../styles.css';
@@ -2756,7 +2757,7 @@ function Messages() {
           description={
             translationSupported
               ? 'Translate messages written in other languages into this one. Runs entirely on your device — message text never leaves your computer or touches a cloud service.'
-              : 'On-device translation isn’t available in this browser. Use a Chromium desktop browser (Chrome/Edge 138+) or the Lotus desktop app.'
+              : translationUnavailableText(isTauriEnv())
           }
           after={
             <SettingsSelect

src/app/pages/client/ClientNonUIFeatures.tsx

@@ -92,7 +92,6 @@ import {
   shouldNotifyThreadReply,
   THREAD_NOTIFICATIONS_FALLBACK_BEHAVIOR,
 } from '../../utils/threadNotifications';
-import { readStatusExpiry, statusExpiryAction, writeStatusExpiry } from '../../utils/statusExpiry';
 import { AccountDataEvent } from '../../../types/matrix/accountData';
 
 // Grace period after the initial sync settles before invite notifications arm, so
@@ -437,7 +436,12 @@ function StatusExpiryMonitor() {
     // permanently and the status stayed set forever. Retry the write (honouring
     // Retry-After), and only forget the status once the server has taken it.
     let clearing = false;
-    const clearStatus = () => {
+    const check = () => {
+      if (clearing) return;
+      const stored = localStorage.getItem(expiryKey);
+      if (!stored) return;
+      const ts = parseInt(stored, 10);
+      if (!ts || Date.now() < ts) return;
       clearing = true;
       setPresenceWithRetry(mx, {
         presence: presenceStateFromSetting(presenceStatusRef.current, hidePresenceRef.current),
@@ -447,31 +451,12 @@ function StatusExpiryMonitor() {
           noteLocalStatusWrite();
           localStorage.removeItem(msgKey);
           localStorage.removeItem(expiryKey);
-          writeStatusExpiry(mx, '').catch(() => undefined);
         })
         .catch(() => undefined)
         .finally(() => {
           clearing = false;
         });
     };
-    const check = () => {
-      if (clearing) return;
-      const stored = localStorage.getItem(expiryKey);
-      const ts = stored ? parseInt(stored, 10) : 0;
-      if (ts && Date.now() >= ts) {
-        clearStatus();
-        return;
-      }
-      // [Gitea #300] An expiry set on another device (account data): clear the
-      // status if it is still that one, otherwise just forget the expiry.
-      const action = statusExpiryAction(
-        readStatusExpiry(mx),
-        mx.getUser(userId)?.presenceStatusMsg,
-        Date.now(),
-      );
-      if (action === 'clear') clearStatus();
-      else if (action === 'forget') writeStatusExpiry(mx, '').catch(() => undefined);
-    };
 
     check();
     // Poll often enough that a rate-limited retry lands promptly, but not so

src/app/utils/statusExpiry.test.ts

@@ -1,22 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { parseStatusExpiry, statusExpiryAction } from './statusExpiry';
-
-test('parseStatusExpiry (#300)', () => {
-  assert.deepEqual(parseStatusExpiry({ status_msg: '🍔 Lunch', expires_at: 5 }), {
-    statusMsg: '🍔 Lunch',
-    expiresAt: 5,
-  });
-  assert.equal(parseStatusExpiry({}), undefined);
-  assert.equal(parseStatusExpiry({ status_msg: '', expires_at: 5 }), undefined);
-  assert.equal(parseStatusExpiry({ status_msg: 'x', expires_at: '5' }), undefined);
-});
-
-test('statusExpiryAction: clears only the status that was set to expire (#300)', () => {
-  const e = { statusMsg: '🍔 Lunch', expiresAt: 1000 };
-  assert.equal(statusExpiryAction(e, '🍔 Lunch', 999), 'none');
-  assert.equal(statusExpiryAction(e, '🍔 Lunch', 1000), 'clear');
-  assert.equal(statusExpiryAction(e, '🎮 Gaming', 2000), 'forget');
-  assert.equal(statusExpiryAction(e, '', 2000), 'forget');
-  assert.equal(statusExpiryAction(undefined, 'x', 2000), 'none');
-});

src/app/utils/statusExpiry.ts

@@ -1,46 +0,0 @@
-import { MatrixClient } from 'matrix-js-sdk';
-import { AccountDataEvent } from '../../types/matrix/accountData';
-import { getAccountData } from './room';
-
-/**
- * [Gitea #300] The status message's auto-clear time, in account data so every
- * Lotus device knows it. Before, only the device that set "clear after 1 hour"
- * (localStorage) ever cleared it, and only while it was open.
- */
-export type StatusExpiry = { statusMsg: string; expiresAt: number };
-
-/** Pure: parse `io.lotus.status_expiry` content. */
-export function parseStatusExpiry(content: unknown): StatusExpiry | undefined {
-  const c = content as { status_msg?: unknown; expires_at?: unknown } | undefined;
-  if (!c || typeof c.status_msg !== 'string' || typeof c.expires_at !== 'number') return undefined;
-  if (!c.status_msg || !Number.isFinite(c.expires_at)) return undefined;
-  return { statusMsg: c.status_msg, expiresAt: c.expires_at };
-}
-
-/**
- * Pure: what to do with a due expiry. Clear the server status only if it is
- * still the one that was set to expire; if it has since changed (e.g. on
- * another device), just forget the expiry.
- */
-export function statusExpiryAction(
-  entry: StatusExpiry | undefined,
-  currentStatusMsg: string | undefined,
-  now: number,
-): 'none' | 'clear' | 'forget' {
-  if (!entry || now < entry.expiresAt) return 'none';
-  return (currentStatusMsg ?? '') === entry.statusMsg ? 'clear' : 'forget';
-}
-
-export const readStatusExpiry = (mx: MatrixClient): StatusExpiry | undefined =>
-  parseStatusExpiry(getAccountData(mx, AccountDataEvent.LotusStatusExpiry)?.getContent());
-
-/** Record (or with no `expiresAt`, remove) the shared auto-clear time. */
-export async function writeStatusExpiry(
-  mx: MatrixClient,
-  statusMsg: string,
-  expiresAt?: number,
-): Promise<void> {
-  const content =
-    statusMsg && expiresAt !== undefined ? { status_msg: statusMsg, expires_at: expiresAt } : {};
-  await mx.setAccountData(AccountDataEvent.LotusStatusExpiry as never, content as never);
-}

src/app/utils/translation/langUtils.test.ts

@@ -1,6 +1,7 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
 import {
+  translationUnavailableText,
   normalizeLang,
   sameLanguage,
   languageName,
@@ -53,3 +54,9 @@ test('curated list: unique codes, English present', () => {
   assert.equal(new Set(codes).size, codes.length);
   assert.ok(codes.includes('en'));
 });
+
+test('translationUnavailableText: no "use the desktop app" inside the desktop app (#349)', () => {
+  assert.doesNotMatch(translationUnavailableText(true), /desktop app\.$|Lotus desktop app/);
+  assert.match(translationUnavailableText(true), /this version of the desktop app/);
+  assert.match(translationUnavailableText(false), /this browser/);
+});

src/app/utils/translation/langUtils.ts

@@ -86,6 +86,16 @@ export function isSupportedTargetLang(code: string): boolean {
   return CURATED_NAME.has(normalizeLang(code));
 }
 
+/**
+ * [Gitea #349] Why translation is unavailable, by platform. The desktop app
+ * on Linux/macOS (WebKit) lacks the on-device APIs too, so it must not send
+ * people to "the Lotus desktop app" they're already using.
+ */
+export const translationUnavailableText = (desktopApp: boolean): string =>
+  desktopApp
+    ? 'On-device translation isn’t available in this version of the desktop app. It works in Chrome or Edge 138+ on a computer.'
+    : 'On-device translation isn’t available in this browser. Use Chrome or Edge 138+ on a computer.';
+
 /** Pure: why a manual Translate did nothing (#287). */
 export const translateSkipMessage = (from: string | undefined, targetLang: string): string =>
   from

src/types/matrix/accountData.ts

@@ -26,9 +26,6 @@ export enum AccountDataEvent {
   // [Gitea #104] Synced subset of the Lotus Settings object (utils/settingsSync).
   LotusSettings = 'io.lotus.settings',
 
-  // [Gitea #300] When the status message auto-clears: { status_msg, expires_at },
-  // so any Lotus device can clear it (not only the one that set it).
-  LotusStatusExpiry = 'io.lotus.status_expiry',
   // [Gitea #333] Timed mutes: { timers: { [roomId]: unmuteAt } }, so any Lotus
   // device can lift a mute set on another.
   LotusMuteTimers = 'io.lotus.mute_timers',