Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
85a2abc46a | ||
|
|
e57af60466 | ||
|
|
1f10866b60 | ||
|
|
d9c797f3f5 |
@@ -57,7 +57,7 @@ import { createUploadAtom, UploadSuccess } from '../../../state/upload';
|
|||||||
import { CompactUploadCardRenderer } from '../../../components/upload-card';
|
import { CompactUploadCardRenderer } from '../../../components/upload-card';
|
||||||
import { useCapabilities } from '../../../hooks/useCapabilities';
|
import { useCapabilities } from '../../../hooks/useCapabilities';
|
||||||
import { Presence, useUserPresence } from '../../../hooks/useUserPresence';
|
import { Presence, useUserPresence } from '../../../hooks/useUserPresence';
|
||||||
import { noteLocalStatusWrite } from '../../../utils/ownStatusSync';
|
import { DND_STATUS_SENTINEL, noteLocalStatusWrite } from '../../../utils/ownStatusSync';
|
||||||
import { ProfileDecoration } from './ProfileDecoration';
|
import { ProfileDecoration } from './ProfileDecoration';
|
||||||
import { EmojiBoard } from '../../../components/emoji-board';
|
import { EmojiBoard } from '../../../components/emoji-board';
|
||||||
import { useStatusPresets } from '../../../hooks/useStatusPresets';
|
import { useStatusPresets } from '../../../hooks/useStatusPresets';
|
||||||
@@ -396,7 +396,8 @@ function ProfileStatus() {
|
|||||||
const [presenceStatus] = useSetting(settingsAtom, 'presenceStatus');
|
const [presenceStatus] = useSetting(settingsAtom, 'presenceStatus');
|
||||||
const [hidePresence] = useSetting(settingsAtom, 'hidePresence');
|
const [hidePresence] = useSetting(settingsAtom, 'hidePresence');
|
||||||
|
|
||||||
const initialStatus = presence?.status ?? localStorage.getItem(STATUS_MSG_KEY(userId)) ?? '';
|
const serverStatus = presence?.status === DND_STATUS_SENTINEL ? undefined : presence?.status;
|
||||||
|
const initialStatus = serverStatus ?? localStorage.getItem(STATUS_MSG_KEY(userId)) ?? '';
|
||||||
const [statusMsg, setStatusMsg] = useState<string>(initialStatus);
|
const [statusMsg, setStatusMsg] = useState<string>(initialStatus);
|
||||||
// True while the user has unsaved local edits — prevents a server presence
|
// True while the user has unsaved local edits — prevents a server presence
|
||||||
// echo from overwriting what the user is currently typing/inserting.
|
// echo from overwriting what the user is currently typing/inserting.
|
||||||
@@ -442,6 +443,9 @@ function ProfileStatus() {
|
|||||||
pendingAppliedRef.current = null; // window elapsed — accept external changes
|
pendingAppliedRef.current = null; // window elapsed — accept external changes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// [Gitea #283] "dnd" is the Do Not Disturb sentinel, not something the user
|
||||||
|
// typed: don't show it in the status field or keep it as their status.
|
||||||
|
if (remoteStatus === DND_STATUS_SENTINEL) return;
|
||||||
if (remoteStatus) {
|
if (remoteStatus) {
|
||||||
setStatusMsg(remoteStatus);
|
setStatusMsg(remoteStatus);
|
||||||
localStorage.setItem(STATUS_MSG_KEY(userId), remoteStatus);
|
localStorage.setItem(STATUS_MSG_KEY(userId), remoteStatus);
|
||||||
|
|||||||
@@ -83,3 +83,14 @@ test('clearPlaintextCaches wipes drafts (#41) and the status message (#204) but
|
|||||||
assert.ok(!removed.includes('cinny_session'), 'session key not this module’s concern');
|
assert.ok(!removed.includes('cinny_session'), 'session key not this module’s concern');
|
||||||
assert.ok(store.has('cinny_session'));
|
assert.ok(store.has('cinny_session'));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('clearPlaintextCaches removes the call-volume list and the settings-sync stamp (#347)', () => {
|
||||||
|
store.clear();
|
||||||
|
store.set('lotus-per-user-volume', '{"@bob:server":0.3}');
|
||||||
|
store.set('settings-sync-meta:@me:server', '{"lastSyncedAt":1}');
|
||||||
|
store.set('settings', '{}');
|
||||||
|
clearPlaintextCaches('@me:server');
|
||||||
|
assert.equal(store.has('lotus-per-user-volume'), false);
|
||||||
|
assert.equal(store.has('settings-sync-meta:@me:server'), false);
|
||||||
|
assert.equal(store.has('settings'), true, 'device preferences are kept');
|
||||||
|
});
|
||||||
|
|||||||
@@ -47,6 +47,8 @@ const clearMsgDrafts = (): void => {
|
|||||||
* - `cinny_recent_gifs_v1` / `cinny_recent_stickers_v1` — media the user sent
|
* - `cinny_recent_gifs_v1` / `cinny_recent_stickers_v1` — media the user sent
|
||||||
* - `navToActivePath<userId>` — per-space last-visited room paths (needs userId)
|
* - `navToActivePath<userId>` — per-space last-visited room paths (needs userId)
|
||||||
* - `lotus_outbox_v1` — decrypted content of messages not yet sent ([Gitea #112])
|
* - `lotus_outbox_v1` — decrypted content of messages not yet sent ([Gitea #112])
|
||||||
|
* - `lotus-per-user-volume`, `settings-sync-meta:<userId>` — whom you adjusted in
|
||||||
|
* calls, and a key naming the account ([Gitea #347])
|
||||||
* - `draft-msg-*` — unsent composer drafts (decrypted message text, unscoped by
|
* - `draft-msg-*` — unsent composer drafts (decrypted message text, unscoped by
|
||||||
* user — see [Gitea #41]; previously deliberately preserved across logout
|
* user — see [Gitea #41]; previously deliberately preserved across logout
|
||||||
* (N98), which let the next account on this device see/send a prior user's
|
* (N98), which let the next account on this device see/send a prior user's
|
||||||
@@ -92,6 +94,24 @@ const clearStatusMessage = (): void => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #347] Per-person residue that isn't message text but still says whom
|
||||||
|
* the previous user dealt with: Element Call's per-user volume memory (same
|
||||||
|
* origin on the web — element-call `lotusVolumeMemory.ts`) and the settings-sync
|
||||||
|
* stamp, whose key names the account.
|
||||||
|
*/
|
||||||
|
export const CALL_VOLUME_KEY = 'lotus-per-user-volume';
|
||||||
|
const clearCallVolumesAndSyncMeta = (userId?: string): void => {
|
||||||
|
const keys = [CALL_VOLUME_KEY, ...(userId ? [`settings-sync-meta:${userId}`] : [])];
|
||||||
|
keys.forEach((key) => {
|
||||||
|
try {
|
||||||
|
localStorage.removeItem(key);
|
||||||
|
} catch {
|
||||||
|
// best-effort
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
export const clearPlaintextCaches = (userId?: string): void => {
|
export const clearPlaintextCaches = (userId?: string): void => {
|
||||||
clearTranslationCache();
|
clearTranslationCache();
|
||||||
clearScheduledMessages();
|
clearScheduledMessages();
|
||||||
@@ -103,5 +123,6 @@ export const clearPlaintextCaches = (userId?: string): void => {
|
|||||||
clearOutbox();
|
clearOutbox();
|
||||||
clearCallSession();
|
clearCallSession();
|
||||||
clearStatusMessage();
|
clearStatusMessage();
|
||||||
|
clearCallVolumesAndSyncMeta(userId);
|
||||||
if (userId) clearNavToActivePathStore(userId);
|
if (userId) clearNavToActivePathStore(userId);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -48,3 +48,34 @@ test("a fresh local save wins over a server read that hasn't caught up", () => {
|
|||||||
'previous',
|
'previous',
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('pickHeartbeatStatus: the "dnd" sentinel is never adopted as the user status (#283)', () => {
|
||||||
|
const base = { lastLocalWriteAt: 0, now: 100_000 };
|
||||||
|
// leaving DND: the server still says "dnd" → restore the real local status
|
||||||
|
assert.equal(
|
||||||
|
pickHeartbeatStatus({
|
||||||
|
...base,
|
||||||
|
local: '🎮 Gaming',
|
||||||
|
server: { presence: 'unavailable', status_msg: 'dnd' },
|
||||||
|
}),
|
||||||
|
'🎮 Gaming',
|
||||||
|
);
|
||||||
|
// a local copy that had absorbed the sentinel becomes empty, not "dnd"
|
||||||
|
assert.equal(
|
||||||
|
pickHeartbeatStatus({
|
||||||
|
...base,
|
||||||
|
local: 'dnd',
|
||||||
|
server: { presence: 'online', status_msg: 'dnd' },
|
||||||
|
}),
|
||||||
|
'',
|
||||||
|
);
|
||||||
|
// ordinary statuses are unaffected
|
||||||
|
assert.equal(
|
||||||
|
pickHeartbeatStatus({
|
||||||
|
...base,
|
||||||
|
local: 'old',
|
||||||
|
server: { presence: 'online', status_msg: 'new' },
|
||||||
|
}),
|
||||||
|
'new',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|||||||
@@ -9,6 +9,9 @@
|
|||||||
* overridden by a server read that hasn't caught up yet.
|
* overridden by a server read that hasn't caught up yet.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/** The status_msg Lotus sends for Do Not Disturb (see usePresenceUpdater). */
|
||||||
|
export const DND_STATUS_SENTINEL = 'dnd';
|
||||||
|
|
||||||
/** Trust this device's own copy for this long after it saved or cleared it. */
|
/** Trust this device's own copy for this long after it saved or cleared it. */
|
||||||
export const LOCAL_WRITE_GRACE_MS = 15_000;
|
export const LOCAL_WRITE_GRACE_MS = 15_000;
|
||||||
|
|
||||||
@@ -37,7 +40,12 @@ export const pickHeartbeatStatus = ({
|
|||||||
lastLocalWriteAt: number;
|
lastLocalWriteAt: number;
|
||||||
now: number;
|
now: number;
|
||||||
}): string => {
|
}): string => {
|
||||||
if (!server || server.presence === 'offline') return local;
|
// [Gitea #283] Lotus encodes Do Not Disturb as status_msg "dnd", so a device
|
||||||
if (now - writtenAt < LOCAL_WRITE_GRACE_MS) return local;
|
// leaving DND must not adopt that sentinel as the user's status — keep (and
|
||||||
|
// so restore) the real one it holds locally.
|
||||||
|
const mine = local === DND_STATUS_SENTINEL ? '' : local;
|
||||||
|
if (!server || server.presence === 'offline') return mine;
|
||||||
|
if (now - writtenAt < LOCAL_WRITE_GRACE_MS) return mine;
|
||||||
|
if (server.status_msg === DND_STATUS_SENTINEL) return mine;
|
||||||
return server.status_msg ?? '';
|
return server.status_msg ?? '';
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user