Compare commits
26
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d55a8ba8a5 | ||
|
|
4b8c3219e9 | ||
|
|
47328d6fee | ||
|
|
b0eb3da830 | ||
|
|
f22f9f07a3 | ||
|
|
2700aad209 | ||
|
|
a8a7e639a9 | ||
|
|
508a123150 | ||
|
|
fe61352d88 | ||
|
|
0bec28b651 | ||
|
|
75089ecd3f | ||
|
|
a4a163df3d | ||
|
|
70f1d640ed | ||
|
|
85a2abc46a | ||
|
|
5130dfc9c8 | ||
|
|
e57af60466 | ||
|
|
1f10866b60 | ||
|
|
d9c797f3f5 | ||
|
|
9b2ec91dd6 | ||
|
|
1618d71e53 | ||
|
|
4736e23400 | ||
|
|
06294f5269 | ||
|
|
fea9484a03 | ||
|
|
ddf9da1a55 | ||
|
|
861293243c | ||
|
|
e50bd677d6 |
+12
-1
@@ -42,7 +42,18 @@ export function collectConsole(page: Page): ConsoleCollector {
|
||||
const errors: string[] = [];
|
||||
const pageErrors: string[] = [];
|
||||
page.on('console', (msg) => {
|
||||
if (msg.type() === 'error') errors.push(msg.text());
|
||||
if (msg.type() !== 'error') return;
|
||||
// The login page's registration probe (POST /_matrix/client/v3/register)
|
||||
// answers 403 "Registration has been disabled" on a homeserver with sign-up
|
||||
// closed (matrix.lotusguild.org since 2026-10-16: accounts come from SSO).
|
||||
// Allowed only for that URL so any other 403 still fails the test.
|
||||
if (
|
||||
/status of 403/.test(msg.text()) &&
|
||||
/\/_matrix\/client\/v3\/register/.test(msg.location().url)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
errors.push(msg.text());
|
||||
});
|
||||
page.on('pageerror', (err) => {
|
||||
pageErrors.push(err.message);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import React, { CSSProperties, ReactNode, useEffect, useRef, useState } from 'react';
|
||||
import React, { CSSProperties, ReactNode, useEffect, useId, useRef, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Box, Button, config, Icon, Icons, Text, color, toRem } from 'folds';
|
||||
import { IContent, MatrixEvent } from 'matrix-js-sdk';
|
||||
@@ -41,7 +41,10 @@ import { formatAccuracy } from '../../utils/geoShare';
|
||||
import { Attachment, AttachmentBox, AttachmentContent, AttachmentHeader } from './attachment';
|
||||
import { FileHeader, FileDownloadButton } from './FileHeader';
|
||||
|
||||
const COLLAPSE_MAX_HEIGHT = 320; // px ≈ 20 lines
|
||||
// ≈ 20 lines; in rem so a larger font setting doesn't show fewer lines (Gitea #343).
|
||||
const COLLAPSE_MAX_HEIGHT_REM = 20;
|
||||
const collapseMaxHeightPx = (): number =>
|
||||
COLLAPSE_MAX_HEIGHT_REM * (parseFloat(getComputedStyle(document.documentElement).fontSize) || 16);
|
||||
|
||||
type CollapsibleBodyProps = {
|
||||
eventId?: string;
|
||||
@@ -79,7 +82,7 @@ function CollapsibleBody({ eventId, children }: CollapsibleBodyProps) {
|
||||
const el = bodyRef.current;
|
||||
if (!el) return undefined;
|
||||
const observer = new ResizeObserver(() => {
|
||||
setNeedsCollapse(el.scrollHeight > COLLAPSE_MAX_HEIGHT);
|
||||
setNeedsCollapse(el.scrollHeight > collapseMaxHeightPx());
|
||||
});
|
||||
observer.observe(el);
|
||||
return () => observer.disconnect();
|
||||
@@ -89,16 +92,36 @@ function CollapsibleBody({ eventId, children }: CollapsibleBodyProps) {
|
||||
// (Gitea #85); useReducedMotion subscribes to the change event instead.
|
||||
const prefersReducedMotion = useReducedMotion();
|
||||
|
||||
const bodyId = useId();
|
||||
const isClipped = needsCollapse && collapsed;
|
||||
// [Gitea #343] The clipped part stays in the DOM, so Tab can reach a link in
|
||||
// it; the browser would then scroll the overflow:hidden box itself (top cut
|
||||
// off, and it stayed that way). Expand instead when focus lands inside.
|
||||
const handleFocus = () => {
|
||||
if (isClipped) setCollapsed(false);
|
||||
};
|
||||
useEffect(() => {
|
||||
if (isClipped && bodyRef.current) bodyRef.current.scrollTop = 0;
|
||||
}, [isClipped]);
|
||||
|
||||
// Fade the content itself rather than painting a fixed-colour gradient over
|
||||
// it, so it blends on any background (bubbles, highlights, chat backgrounds).
|
||||
const fadeMask = 'linear-gradient(#000 calc(100% - 3rem), transparent)';
|
||||
|
||||
return (
|
||||
<div>
|
||||
<div
|
||||
ref={bodyRef}
|
||||
id={bodyId}
|
||||
onFocus={handleFocus}
|
||||
style={{
|
||||
position: 'relative',
|
||||
...(needsCollapse && collapsed
|
||||
...(isClipped
|
||||
? {
|
||||
maxHeight: `${COLLAPSE_MAX_HEIGHT}px`,
|
||||
maxHeight: `${COLLAPSE_MAX_HEIGHT_REM}rem`,
|
||||
overflow: 'hidden',
|
||||
maskImage: fadeMask,
|
||||
WebkitMaskImage: fadeMask,
|
||||
transition: prefersReducedMotion ? undefined : 'max-height 0.2s ease',
|
||||
}
|
||||
: {
|
||||
@@ -107,23 +130,12 @@ function CollapsibleBody({ eventId, children }: CollapsibleBodyProps) {
|
||||
}}
|
||||
>
|
||||
{children}
|
||||
{needsCollapse && collapsed && (
|
||||
<div
|
||||
style={{
|
||||
position: 'absolute',
|
||||
bottom: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
height: '3rem',
|
||||
background: `linear-gradient(transparent, ${color.Surface.Container})`,
|
||||
pointerEvents: 'none',
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
{needsCollapse && (
|
||||
<button
|
||||
type="button"
|
||||
aria-expanded={!collapsed}
|
||||
aria-controls={bodyId}
|
||||
onClick={() => setCollapsed((c) => !c)}
|
||||
style={{
|
||||
cursor: 'pointer',
|
||||
@@ -134,7 +146,8 @@ function CollapsibleBody({ eventId, children }: CollapsibleBodyProps) {
|
||||
}}
|
||||
>
|
||||
<Text as="span" size="T200" style={{ color: color.Primary.Main }}>
|
||||
{collapsed ? 'Read more ↓' : 'Show less ↑'}
|
||||
{collapsed ? 'Read more' : 'Show less'}
|
||||
<span aria-hidden="true">{collapsed ? ' ↓' : ' ↑'}</span>
|
||||
</Text>
|
||||
</button>
|
||||
)}
|
||||
|
||||
@@ -51,7 +51,7 @@ const dark: CSSProperties = {
|
||||
backgroundSize: '260% 240%, 300% 260%, 240% 280%, 220% 200%, 100% 100%, 100% 100%',
|
||||
backgroundPosition: '0% 30%, 100% 70%, 50% 0%, 20% 80%, 50% 50%, 50% 50%',
|
||||
backgroundRepeat: 'no-repeat',
|
||||
animation: `${auroraFlow} 60s ease-in-out infinite`,
|
||||
animation: `${auroraFlow} 60s steps(180) infinite`,
|
||||
};
|
||||
|
||||
const light: CSSProperties = {
|
||||
@@ -75,7 +75,7 @@ const light: CSSProperties = {
|
||||
backgroundSize: '260% 240%, 300% 260%, 240% 280%, 220% 200%, 100% 100%, 100% 100%',
|
||||
backgroundPosition: '0% 30%, 100% 70%, 50% 0%, 20% 80%, 50% 50%, 50% 50%',
|
||||
backgroundRepeat: 'no-repeat',
|
||||
animation: `${auroraFlow} 60s ease-in-out infinite`,
|
||||
animation: `${auroraFlow} 60s steps(180) infinite`,
|
||||
};
|
||||
|
||||
export const animAurora: ChatBgVariants = { dark, light };
|
||||
|
||||
@@ -55,7 +55,7 @@ export const animFireflies: ChatBgVariants = {
|
||||
'0 0', // wash A (static)
|
||||
'0 0', // wash B (static)
|
||||
].join(','),
|
||||
animation: `${firefliesDrift} 44s linear infinite`,
|
||||
animation: `${firefliesDrift} 44s steps(528) infinite`,
|
||||
},
|
||||
|
||||
// Light: a cozy warm dim-dusk. No harsh dots on white — soft amber motes with
|
||||
@@ -93,6 +93,6 @@ export const animFireflies: ChatBgVariants = {
|
||||
'0 0', // wash A (static)
|
||||
'0 0', // wash B (static)
|
||||
].join(','),
|
||||
animation: `${firefliesDrift} 44s linear infinite`,
|
||||
animation: `${firefliesDrift} 44s steps(528) infinite`,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -76,7 +76,7 @@ export const animPulse: ChatBgVariants = {
|
||||
'0 0', // base wash
|
||||
'0 0', // vignette
|
||||
].join(','),
|
||||
animation: `${gridPulse} 22s ease-in-out infinite`,
|
||||
animation: `${gridPulse} 22s steps(528) infinite`,
|
||||
},
|
||||
|
||||
// Light: soft slate-blue grid on pale cool-white, a gentle luminance breathe.
|
||||
@@ -116,6 +116,6 @@ export const animPulse: ChatBgVariants = {
|
||||
'0 0', // base wash
|
||||
'0 0', // vignette
|
||||
].join(','),
|
||||
animation: `${gridPulse} 22s ease-in-out infinite`,
|
||||
animation: `${gridPulse} 22s steps(528) infinite`,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -97,7 +97,7 @@ export const animRain: ChatBgVariants = {
|
||||
].join(','),
|
||||
backgroundSize: ['260px 200px', '100% 100%', '100% 100%', '100% 100%'].join(','),
|
||||
backgroundPosition: ['0 0', '0 0', '0 0', '0 0'].join(','),
|
||||
animation: `${rainFall} 12s linear infinite`,
|
||||
animation: `${rainFall} 12s steps(288) infinite`,
|
||||
},
|
||||
|
||||
// Light: soft teal-grey streaks on a pale cool base — elegant, never neon.
|
||||
@@ -118,6 +118,6 @@ export const animRain: ChatBgVariants = {
|
||||
].join(','),
|
||||
backgroundSize: ['260px 200px', '100% 100%', '100% 100%', '100% 100%'].join(','),
|
||||
backgroundPosition: ['0 0', '0 0', '0 0', '0 0'].join(','),
|
||||
animation: `${rainFall} 12s linear infinite`,
|
||||
animation: `${rainFall} 12s steps(288) infinite`,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -68,7 +68,7 @@ export const animStars: ChatBgVariants = {
|
||||
'0 0', // nebula A
|
||||
'0 0', // nebula B
|
||||
].join(','),
|
||||
animation: `${starDrift} 90s linear infinite`,
|
||||
animation: `${starDrift} 90s steps(1080) infinite`,
|
||||
},
|
||||
|
||||
// Light: an airy pre-dawn sky. No literal white-on-white stars — instead very
|
||||
@@ -112,6 +112,6 @@ export const animStars: ChatBgVariants = {
|
||||
'0 0', // wash A
|
||||
'0 0', // wash B
|
||||
].join(','),
|
||||
animation: `${starDrift} 100s linear infinite`,
|
||||
animation: `${starDrift} 100s steps(1200) infinite`,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -149,6 +149,11 @@ export const getChatBg = (
|
||||
}
|
||||
// For animated backgrounds, promote the element to its own compositor layer so
|
||||
// background-position keyframes don't trigger repaints on descendant elements.
|
||||
// [Gitea #337] background-position can't run on the compositor, so every
|
||||
// animation frame repaints the whole chat area (45 to 70% main-thread busy
|
||||
// at 60 fps). The drifts are slow (3–22 px/s), so each animation uses steps():
|
||||
// ~12 updates/s for the slow ones, ~24/s for rain and pulse: visually the
|
||||
// same, a fraction of the repaints.
|
||||
if (style.animation) {
|
||||
return { ...style, willChange: 'background-position', contain: 'paint' };
|
||||
}
|
||||
|
||||
@@ -48,6 +48,7 @@ import {
|
||||
addRecentForwardTarget,
|
||||
} from '../../../state/recentForwardTargets';
|
||||
import { buildForwardContent, buildPlaintextAttachmentContent } from './forwardContent';
|
||||
import { useLocalRoomNames } from '../../../hooks/useRoomMeta';
|
||||
|
||||
type RoomRowProps = {
|
||||
room: Room;
|
||||
@@ -58,6 +59,7 @@ type RoomRowProps = {
|
||||
sending: boolean;
|
||||
};
|
||||
function RoomRow({ room, dm, useAuthentication, selected, onToggle, sending }: RoomRowProps) {
|
||||
const localNames = useLocalRoomNames();
|
||||
const mx = useMatrixClient();
|
||||
const avatarMxc = room.getMxcAvatarUrl();
|
||||
const avatarUrl = avatarMxc
|
||||
@@ -97,7 +99,7 @@ function RoomRow({ room, dm, useAuthentication, selected, onToggle, sending }: R
|
||||
>
|
||||
<Box direction="Column">
|
||||
<Text size="T300" truncate>
|
||||
{room.name}
|
||||
{localNames[room.roomId] ?? room.name}
|
||||
</Text>
|
||||
{dm && (
|
||||
<Text size="T200" priority="300" truncate>
|
||||
@@ -212,6 +214,7 @@ function RecentChip({
|
||||
onToggle: () => void;
|
||||
sending: boolean;
|
||||
}) {
|
||||
const localNames = useLocalRoomNames();
|
||||
const mx = useMatrixClient();
|
||||
const avatarMxc = room.getMxcAvatarUrl();
|
||||
const avatarUrl = avatarMxc
|
||||
@@ -240,7 +243,7 @@ function RecentChip({
|
||||
}
|
||||
>
|
||||
<Text size="B300" truncate style={{ maxWidth: toRem(120) }}>
|
||||
{room.name}
|
||||
{localNames[room.roomId] ?? room.name}
|
||||
</Text>
|
||||
</Chip>
|
||||
);
|
||||
@@ -252,6 +255,7 @@ type Props = {
|
||||
};
|
||||
|
||||
export function ForwardMessageDialog({ mEvent, onClose }: Props) {
|
||||
const localNames = useLocalRoomNames();
|
||||
const mx = useMatrixClient();
|
||||
const modalStyle = useModalStyle(400);
|
||||
const directs = useAtomValue(mDirectAtom);
|
||||
@@ -296,8 +300,10 @@ export function ForwardMessageDialog({ mEvent, onClose }: Props) {
|
||||
const filtered = useMemo(() => {
|
||||
if (!query) return allRooms;
|
||||
const q = query.toLowerCase();
|
||||
return allRooms.filter((r) => r.name.toLowerCase().includes(q));
|
||||
}, [allRooms, query]);
|
||||
return allRooms.filter((r) =>
|
||||
[r.name, localNames[r.roomId]].some((nm) => nm?.toLowerCase().includes(q)),
|
||||
);
|
||||
}, [allRooms, query, localNames]);
|
||||
|
||||
// Resolve recent target ids to still-joined rooms (drop ones left/gone).
|
||||
const recentRooms = useMemo(
|
||||
|
||||
@@ -37,6 +37,7 @@ import {
|
||||
useAsyncSearch,
|
||||
UseAsyncSearchOptions,
|
||||
} from '../../hooks/useAsyncSearch';
|
||||
import { useLocalRoomNames } from '../../hooks/useRoomMeta';
|
||||
import { useAllJoinedRoomsSet, useGetRoom } from '../../hooks/useGetRoom';
|
||||
import { RoomAvatar, RoomIcon } from '../../components/room-avatar';
|
||||
import {
|
||||
@@ -157,17 +158,20 @@ export function Search({ requestClose }: SearchProps) {
|
||||
const topActiveRooms = useTopActiveRooms(searchRoomType, rooms, directs, spaces);
|
||||
const targetRooms = useSearchTargetRooms(searchRoomType, rooms, directs, spaces);
|
||||
|
||||
const localNames = useLocalRoomNames();
|
||||
const getTargetStr: SearchItemStrGetter<string> = useCallback(
|
||||
(roomId: string) => {
|
||||
const roomName = getRoom(roomId)?.name ?? roomId;
|
||||
// [Gitea #336] Match the user's own "Rename for me" name as well.
|
||||
const names = localNames[roomId] ? [localNames[roomId], roomName] : [roomName];
|
||||
if (mDirects.has(roomId)) {
|
||||
const targetUserId = getDmUserId(roomId, getRoom, mx.getSafeUserId());
|
||||
const targetUsername = targetUserId && getMxIdLocalPart(targetUserId);
|
||||
if (targetUsername) return [roomName, targetUsername];
|
||||
if (targetUsername) return [...names, targetUsername];
|
||||
}
|
||||
return roomName;
|
||||
return names.length === 1 ? names[0] : names;
|
||||
},
|
||||
[getRoom, mDirects, mx],
|
||||
[getRoom, mDirects, mx, localNames],
|
||||
);
|
||||
|
||||
const [result, search, resetSearch] = useAsyncSearch(targetRooms, getTargetStr, SEARCH_OPTIONS);
|
||||
@@ -388,8 +392,10 @@ export function Search({ requestClose }: SearchProps) {
|
||||
<Box grow="Yes" alignItems="Center" gap="100">
|
||||
<Text size="T400" truncate>
|
||||
{queryHighlighRegex
|
||||
? highlightText(queryHighlighRegex, [room.name])
|
||||
: room.name}
|
||||
? highlightText(queryHighlighRegex, [
|
||||
localNames[room.roomId] ?? room.name,
|
||||
])
|
||||
: (localNames[room.roomId] ?? room.name)}
|
||||
</Text>
|
||||
{dmUsername && (
|
||||
<Text as="span" size="T200" priority="300" truncate>
|
||||
|
||||
@@ -57,7 +57,7 @@ import { createUploadAtom, UploadSuccess } from '../../../state/upload';
|
||||
import { CompactUploadCardRenderer } from '../../../components/upload-card';
|
||||
import { useCapabilities } from '../../../hooks/useCapabilities';
|
||||
import { Presence, useUserPresence } from '../../../hooks/useUserPresence';
|
||||
import { noteLocalStatusWrite } from '../../../utils/ownStatusSync';
|
||||
import { DND_STATUS_SENTINEL, noteLocalStatusWrite } from '../../../utils/ownStatusSync';
|
||||
import { ProfileDecoration } from './ProfileDecoration';
|
||||
import { EmojiBoard } from '../../../components/emoji-board';
|
||||
import { useStatusPresets } from '../../../hooks/useStatusPresets';
|
||||
@@ -396,7 +396,8 @@ function ProfileStatus() {
|
||||
const [presenceStatus] = useSetting(settingsAtom, 'presenceStatus');
|
||||
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);
|
||||
// True while the user has unsaved local edits — prevents a server presence
|
||||
// echo from overwriting what the user is currently typing/inserting.
|
||||
@@ -442,6 +443,9 @@ function ProfileStatus() {
|
||||
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) {
|
||||
setStatusMsg(remoteStatus);
|
||||
localStorage.setItem(STATUS_MSG_KEY(userId), remoteStatus);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { useEffect, useRef } from 'react';
|
||||
import { SetPresence } from 'matrix-js-sdk';
|
||||
import { PresenceDeduper, PresenceWrite } from '../utils/presenceWrite';
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
import { getLastLocalStatusWrite, pickHeartbeatStatus } from '../utils/ownStatusSync';
|
||||
@@ -90,11 +91,21 @@ export function usePresenceUpdater() {
|
||||
return status;
|
||||
};
|
||||
|
||||
// [Gitea #282] A one-off PUT /presence doesn't stick: the SDK long-polls
|
||||
// /sync with set_presence=online by default and Synapse treats every sync
|
||||
// as "online", so Invisible / Idle / DND flipped back within seconds. Tell
|
||||
// the sync loop which presence to report too (as Element does).
|
||||
const syncPresence = (presence: SetPresence) => {
|
||||
mx.setSyncPresence(presence).catch(() => undefined);
|
||||
};
|
||||
|
||||
const setOnline = async () => {
|
||||
syncPresence(SetPresence.Online);
|
||||
const status = await resolveStatus();
|
||||
return send({ presence: 'online', ...(status ? { status_msg: status } : {}) }, 'online');
|
||||
};
|
||||
const setUnavailable = async (statusMsg?: string) => {
|
||||
syncPresence(SetPresence.Unavailable);
|
||||
const status = await resolveStatus();
|
||||
return send(
|
||||
{
|
||||
@@ -104,7 +115,10 @@ export function usePresenceUpdater() {
|
||||
'unavailable',
|
||||
);
|
||||
};
|
||||
const setOffline = () => send({ presence: 'offline', status_msg: '' }, 'offline');
|
||||
const setOffline = () => {
|
||||
syncPresence(SetPresence.Offline);
|
||||
return send({ presence: 'offline', status_msg: '' }, 'offline');
|
||||
};
|
||||
|
||||
// Manual presence overrides — no activity tracking needed.
|
||||
if (hidePresence || presenceStatus === 'invisible') {
|
||||
@@ -167,13 +181,17 @@ export function usePresenceUpdater() {
|
||||
// it isn't usable here. fetch(..., { keepalive: true }) lets the request outlive the
|
||||
// page and is the correct mechanism for an authed endpoint. (keepalive bodies are
|
||||
// capped at 64KB, which this tiny payload is well under.)
|
||||
// [Gitea #339] Synapse treats a missing status_msg as "clear it", so a bare
|
||||
// { presence: 'offline' } wiped the user's custom status for everyone whenever
|
||||
// any tab closed or reloaded. Send the current status along with it.
|
||||
const status = readStatus();
|
||||
fetch(`${baseUrl}/_matrix/client/v3/presence/${encodeURIComponent(userId)}/status`, {
|
||||
method: 'PUT',
|
||||
headers: {
|
||||
Authorization: `Bearer ${token}`,
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({ presence: 'offline' }),
|
||||
body: JSON.stringify({ presence: 'offline', ...(status ? { status_msg: status } : {}) }),
|
||||
keepalive: true,
|
||||
}).catch((err) => warnPresenceFailure('offline (pagehide)', err));
|
||||
};
|
||||
|
||||
@@ -102,6 +102,22 @@ export const useLocalRoomName = (room: Room): string => {
|
||||
return localNames[room.roomId] ?? name;
|
||||
};
|
||||
|
||||
/**
|
||||
* [Gitea #336] The whole "Rename for me" map, for lists that show many rooms
|
||||
* (quick switcher, forward/share pickers) so they use the name the user sees in
|
||||
* the sidebar, not the server name.
|
||||
*/
|
||||
export const useLocalRoomNames = (): Readonly<Record<string, string>> => {
|
||||
const mx = useMatrixClient();
|
||||
return roomNamesStore.useValue(mx);
|
||||
};
|
||||
|
||||
/** Non-hook read for notification paths (toast / OS notification titles). */
|
||||
export const getLocalRoomName = (
|
||||
mx: ReturnType<typeof useMatrixClient>,
|
||||
roomId: string,
|
||||
): string | undefined => roomNamesStore.getLatest(mx)[roomId];
|
||||
|
||||
export const useHasLocalRoomName = (roomId: string): boolean => {
|
||||
const mx = useMatrixClient();
|
||||
const localNames = roomNamesStore.useValue(mx);
|
||||
|
||||
@@ -5,6 +5,7 @@ import { StateEvent } from '../../types/matrix/room';
|
||||
import { VoiceLimitContent } from '../features/common-settings/general/RoomVoiceLimit';
|
||||
import { useCallMembers, useCallSession } from './useCall';
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
import { voiceChannelOccupancy } from '../utils/voiceChannelFull';
|
||||
|
||||
export type VoiceChannelFull = {
|
||||
channelFull: boolean;
|
||||
@@ -26,9 +27,11 @@ export const useVoiceChannelFull = (room: Room): VoiceChannelFull => {
|
||||
|
||||
return useMemo(() => {
|
||||
const maxUsers = limitEvent?.getContent<VoiceLimitContent>().max_users ?? 0;
|
||||
// A user already counted in the session is rejoining and should not be blocked.
|
||||
const alreadyMember = callMembers.some((m) => m.sender === mx.getSafeUserId());
|
||||
const channelFull = maxUsers > 0 && !alreadyMember && callMembers.length >= maxUsers;
|
||||
return { channelFull, current: callMembers.length, max: maxUsers };
|
||||
// Distinct people, not per-device memberships (Gitea #342).
|
||||
return voiceChannelOccupancy(
|
||||
callMembers.map((m) => m.sender),
|
||||
mx.getSafeUserId(),
|
||||
maxUsers,
|
||||
);
|
||||
}, [limitEvent, callMembers, mx]);
|
||||
};
|
||||
|
||||
@@ -14,6 +14,7 @@ import {
|
||||
ThreadEvent,
|
||||
} from 'matrix-js-sdk';
|
||||
import { useNotificationsQuiet } from '../../hooks/useNotificationsQuiet';
|
||||
import { getLocalRoomName } from '../../hooks/useRoomMeta';
|
||||
import { roomToUnreadAtom } from '../../state/room/roomToUnread';
|
||||
import NotificationSound from '../../../../public/sound/notification.ogg';
|
||||
import InviteSound from '../../../../public/sound/invite.ogg';
|
||||
@@ -639,7 +640,8 @@ function MessageNotifications() {
|
||||
const avatarMxc =
|
||||
room.getAvatarFallbackMember()?.getMxcAvatarUrl() ?? room.getMxcAvatarUrl();
|
||||
notify({
|
||||
roomName: room.name ?? 'Unknown',
|
||||
// [Gitea #336] the user's own "Rename for me" name when they set one
|
||||
roomName: getLocalRoomName(mx, room.roomId) ?? room.name ?? 'Unknown',
|
||||
roomAvatar: avatarMxc
|
||||
? (mxcUrlToHttp(mx, avatarMxc, useAuthentication, 96, 96, 'crop') ?? undefined)
|
||||
: undefined,
|
||||
@@ -783,15 +785,20 @@ function ReminderMonitor() {
|
||||
const { reminders, removeReminder } = useReminders();
|
||||
const setToast = useSetAtom(toastQueueAtom);
|
||||
const mDirects = useAtomValue(mDirectAtom);
|
||||
const [showNotifications] = useSetting(settingsAtom, 'showNotifications');
|
||||
const quietActive = useNotificationsQuiet();
|
||||
const firedRef = useRef<Set<string>>(new Set());
|
||||
const removingRef = useRef<Set<string>>(new Set());
|
||||
// Read the latest reminders / DM map via refs so the poll interval below is
|
||||
// created once — not torn down and restarted (which resets its 30s countdown
|
||||
// and can indefinitely defer a near-due reminder) on every reminder sync (N115).
|
||||
// Read the latest reminders / DM map / notification prefs via refs so the poll
|
||||
// interval below is created once — not torn down and restarted (which resets
|
||||
// its 30s countdown and can indefinitely defer a near-due reminder) on every
|
||||
// reminder sync (N115).
|
||||
const remindersRef = useRef(reminders);
|
||||
remindersRef.current = reminders;
|
||||
const mDirectsRef = useRef(mDirects);
|
||||
mDirectsRef.current = mDirects;
|
||||
const osNotifyRef = useRef(false);
|
||||
osNotifyRef.current = showNotifications && !quietActive;
|
||||
|
||||
useEffect(() => {
|
||||
const check = () => {
|
||||
@@ -803,7 +810,7 @@ function ReminderMonitor() {
|
||||
if (!firedRef.current.has(key)) {
|
||||
firedRef.current.add(key);
|
||||
const room = mx.getRoom(r.roomId);
|
||||
const roomName = room?.name ?? 'Unknown Room';
|
||||
const roomName = getLocalRoomName(mx, r.roomId) ?? room?.name ?? 'Unknown Room';
|
||||
// Reminders for E2EE rooms carry no text (account data is server-
|
||||
// readable), so resolve the body from the local timeline at fire time.
|
||||
const localBody = room?.findEventById(r.eventId)?.getContent()?.body;
|
||||
@@ -815,6 +822,23 @@ function ReminderMonitor() {
|
||||
const hashPath = mDirectsRef.current.has(r.roomId)
|
||||
? getDirectRoomPath(r.roomId, r.eventId)
|
||||
: getHomeRoomPath(r.roomId, r.eventId);
|
||||
// [Gitea #338] A reminder is only done once the user has SEEN it: the
|
||||
// toast stays until clicked or dismissed (it used to vanish after 4 s
|
||||
// and the reminder was deleted at once, so one due while the user was
|
||||
// away was lost). The removal is persisted on that click/dismiss; an
|
||||
// unseen reminder comes back on the next start.
|
||||
const done = () => {
|
||||
if (removingRef.current.has(key)) return;
|
||||
removingRef.current.add(key);
|
||||
removeReminder(r.eventId, r.timestamp).catch(() => {
|
||||
removingRef.current.delete(key);
|
||||
});
|
||||
};
|
||||
const open = () => {
|
||||
done();
|
||||
// window.location.hash setter auto-prepends '#' (as the toast does)
|
||||
window.location.hash = hashPath;
|
||||
};
|
||||
setToast({
|
||||
id: `reminder-${key}`,
|
||||
displayName: 'Reminder',
|
||||
@@ -822,16 +846,30 @@ function ReminderMonitor() {
|
||||
roomName,
|
||||
roomId: r.roomId,
|
||||
hashPath,
|
||||
sticky: true,
|
||||
onClick: open,
|
||||
onDismiss: done,
|
||||
});
|
||||
}
|
||||
// Persist the removal, retrying on a later tick if it fails — without
|
||||
// re-showing the toast (N114). The server echo drops it from
|
||||
// `reminders` once the write lands.
|
||||
if (!removingRef.current.has(key)) {
|
||||
removingRef.current.add(key);
|
||||
removeReminder(r.eventId, r.timestamp).catch(() => {
|
||||
removingRef.current.delete(key);
|
||||
});
|
||||
// Away from the window: also raise an OS notification (the reminder is
|
||||
// an explicit request, but quiet hours / notifications-off win). Never
|
||||
// put decrypted E2EE text in it (N106).
|
||||
if (osNotifyRef.current && notificationPermission('granted') && !document.hasFocus()) {
|
||||
const encrypted = !!room?.hasEncryptionStateEvent();
|
||||
showOsNotification(
|
||||
'Reminder',
|
||||
{
|
||||
icon: LogoSVG,
|
||||
badge: LogoSVG,
|
||||
body: encrypted ? `A message in ${roomName}` : body,
|
||||
tag: `reminder-${key}`,
|
||||
data: { path: hashPath, roomId: r.roomId },
|
||||
},
|
||||
() => {
|
||||
window.focus();
|
||||
open();
|
||||
},
|
||||
).catch(() => undefined);
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
@@ -38,6 +38,7 @@ import {
|
||||
import { BlockType } from '../../../components/editor';
|
||||
import { bytesToSize } from '../../../utils/common';
|
||||
import { getHomePath } from '../../pathUtils';
|
||||
import { useLocalRoomNames } from '../../../hooks/useRoomMeta';
|
||||
|
||||
type Shared = { payload: SharePayload; files: File[] };
|
||||
|
||||
@@ -47,6 +48,7 @@ type Shared = { payload: SharePayload; files: File[] };
|
||||
* as the draft) — the user still presses Send.
|
||||
*/
|
||||
export function Share() {
|
||||
const localNames = useLocalRoomNames();
|
||||
const mx = useMatrixClient();
|
||||
const navigate = useNavigate();
|
||||
const { navigateRoom } = useRoomNavigate();
|
||||
@@ -69,8 +71,12 @@ export function Share() {
|
||||
.filter((r) => r.getMyMembership() === 'join' && !r.isSpaceRoom())
|
||||
.sort((a, b) => (b.getLastActiveTimestamp() ?? 0) - (a.getLastActiveTimestamp() ?? 0));
|
||||
const q = query.trim().toLowerCase();
|
||||
return q ? all.filter((r) => r.name.toLowerCase().includes(q)) : all;
|
||||
}, [mx, query]);
|
||||
return q
|
||||
? all.filter((r) =>
|
||||
[r.name, localNames[r.roomId]].some((nm) => nm?.toLowerCase().includes(q)),
|
||||
)
|
||||
: all;
|
||||
}, [mx, query, localNames]);
|
||||
|
||||
// Written straight into the room's draft atoms so its composer shows the
|
||||
// upload board + text as soon as it mounts.
|
||||
@@ -210,6 +216,7 @@ function ShareRoomRow({
|
||||
disabled: boolean;
|
||||
onPick: (room: Room) => void;
|
||||
}) {
|
||||
const localNames = useLocalRoomNames();
|
||||
const mx = useMatrixClient();
|
||||
const avatarMxc = room.getMxcAvatarUrl();
|
||||
const avatarUrl = avatarMxc
|
||||
@@ -237,7 +244,7 @@ function ShareRoomRow({
|
||||
>
|
||||
<Box direction="Column">
|
||||
<Text size="T300" truncate>
|
||||
{room.name}
|
||||
{localNames[room.roomId] ?? room.name}
|
||||
</Text>
|
||||
{dm && (
|
||||
<Text size="T200" priority="300" truncate>
|
||||
|
||||
@@ -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(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
|
||||
* - `navToActivePath<userId>` — per-space last-visited room paths (needs userId)
|
||||
* - `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
|
||||
* user — see [Gitea #41]; previously deliberately preserved across logout
|
||||
* (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 => {
|
||||
clearTranslationCache();
|
||||
clearScheduledMessages();
|
||||
@@ -103,5 +123,6 @@ export const clearPlaintextCaches = (userId?: string): void => {
|
||||
clearOutbox();
|
||||
clearCallSession();
|
||||
clearStatusMessage();
|
||||
clearCallVolumesAndSyncMeta(userId);
|
||||
if (userId) clearNavToActivePathStore(userId);
|
||||
};
|
||||
|
||||
@@ -38,3 +38,38 @@ test('hostFromText only accepts URL/host-shaped text; IDN becomes punycode', ()
|
||||
assert.equal(analyzeLink('paypal.com', 'https://xn--pypal-4ve.com/')?.punycode, true);
|
||||
assert.equal(analyzeLink('paypal.com', 'https://xn--pypal-4ve.com/')?.mismatch, true);
|
||||
});
|
||||
|
||||
test('a trusted name inside a sentence still exposes a different destination (#335)', () => {
|
||||
const a = analyzeLink('Log in at chat.lotusguild.org', 'https://evil.example/');
|
||||
assert.equal(a?.mismatch, true);
|
||||
assert.equal(a?.shownHost, 'chat.lotusguild.org');
|
||||
assert.equal(
|
||||
analyzeLink('chat.lotusguild.org (official)', 'https://evil.example/')?.mismatch,
|
||||
true,
|
||||
);
|
||||
assert.equal(
|
||||
analyzeLink('Open https://paypal.com/login now', 'https://evil.example/')?.mismatch,
|
||||
true,
|
||||
);
|
||||
// honest sentences are not flagged
|
||||
assert.equal(
|
||||
analyzeLink('Log in at chat.lotusguild.org', 'https://chat.lotusguild.org/login')?.mismatch,
|
||||
false,
|
||||
);
|
||||
assert.equal(analyzeLink('read the docs', 'https://evil.example/')?.mismatch, false);
|
||||
assert.equal(analyzeLink('see main.py and report.pdf', 'https://github.com/x')?.mismatch, false);
|
||||
assert.equal(analyzeLink('release v1.2.3 notes', 'https://github.com/x')?.mismatch, false);
|
||||
});
|
||||
|
||||
test('shared hosting suffixes are separate sites (#335)', () => {
|
||||
assert.equal(registrableDomain('alice.github.io'), 'alice.github.io');
|
||||
assert.equal(registrableDomain('www.alice.github.io'), 'alice.github.io');
|
||||
assert.equal(registrableDomain('bucket.s3.amazonaws.com'), 'bucket.s3.amazonaws.com');
|
||||
assert.equal(analyzeLink('alice.github.io', 'https://evil.github.io/')?.mismatch, true);
|
||||
assert.equal(analyzeLink('lotusguild.pages.dev', 'https://evil.pages.dev/')?.mismatch, true);
|
||||
assert.equal(
|
||||
analyzeLink('alice.github.io/blog', 'https://alice.github.io/blog/1')?.mismatch,
|
||||
false,
|
||||
);
|
||||
assert.equal(registrableDomain('news.bbc.co.uk'), 'bbc.co.uk');
|
||||
});
|
||||
|
||||
+131
-7
@@ -48,11 +48,53 @@ const TWO_LABEL_SUFFIXES = new Set([
|
||||
'com.tw',
|
||||
]);
|
||||
|
||||
// [Gitea #335] Shared-hosting suffixes (the Public Suffix List's "private"
|
||||
// section, the ones phishing actually uses): every customer gets their own
|
||||
// subdomain, so `alice.github.io` and `evil.github.io` are different sites.
|
||||
// A curated list rather than the full PSL keeps this out of the bundle budget.
|
||||
const SHARED_HOSTING_SUFFIXES = new Set([
|
||||
'github.io',
|
||||
'gitlab.io',
|
||||
'codeberg.page',
|
||||
'pages.dev',
|
||||
'workers.dev',
|
||||
'trycloudflare.com',
|
||||
'netlify.app',
|
||||
'vercel.app',
|
||||
'web.app',
|
||||
'firebaseapp.com',
|
||||
'appspot.com',
|
||||
'herokuapp.com',
|
||||
'onrender.com',
|
||||
'fly.dev',
|
||||
'glitch.me',
|
||||
'replit.app',
|
||||
'repl.co',
|
||||
'surge.sh',
|
||||
'blogspot.com',
|
||||
'wordpress.com',
|
||||
'wixsite.com',
|
||||
'weebly.com',
|
||||
'azurewebsites.net',
|
||||
'cloudfront.net',
|
||||
'ngrok.io',
|
||||
'ngrok-free.app',
|
||||
'duckdns.org',
|
||||
's3.amazonaws.com',
|
||||
]);
|
||||
|
||||
const isPublicSuffix = (suffix: string): boolean =>
|
||||
TWO_LABEL_SUFFIXES.has(suffix) || SHARED_HOSTING_SUFFIXES.has(suffix);
|
||||
|
||||
export const registrableDomain = (host: string): string => {
|
||||
const labels = host.toLowerCase().replace(/\.$/, '').split('.');
|
||||
if (labels.length <= 2) return labels.join('.');
|
||||
const lastTwo = labels.slice(-2).join('.');
|
||||
return TWO_LABEL_SUFFIXES.has(lastTwo) ? labels.slice(-3).join('.') : lastTwo;
|
||||
// Longest matching public suffix wins (3 labels, e.g. s3.amazonaws.com, then 2).
|
||||
for (const n of [3, 2]) {
|
||||
if (labels.length > n && isPublicSuffix(labels.slice(-n).join('.'))) {
|
||||
return labels.slice(-(n + 1)).join('.');
|
||||
}
|
||||
}
|
||||
return labels.slice(-2).join('.');
|
||||
};
|
||||
|
||||
const HOST_LIKE =
|
||||
@@ -72,6 +114,85 @@ export const hostFromText = (text: string): string | null => {
|
||||
}
|
||||
};
|
||||
|
||||
// Words that look like hosts but are usually files or versions in chat
|
||||
// ("see main.py", "report.pdf", "v1.2.3"): skipped inside sentences unless
|
||||
// written as a URL (scheme, www., or a path) so ordinary links aren't flagged.
|
||||
const FILE_EXTENSIONS = new Set([
|
||||
'py',
|
||||
'sh',
|
||||
'md',
|
||||
'rs',
|
||||
'js',
|
||||
'ts',
|
||||
'tsx',
|
||||
'jsx',
|
||||
'json',
|
||||
'yaml',
|
||||
'yml',
|
||||
'toml',
|
||||
'txt',
|
||||
'log',
|
||||
'csv',
|
||||
'pdf',
|
||||
'zip',
|
||||
'gz',
|
||||
'tar',
|
||||
'png',
|
||||
'jpg',
|
||||
'jpeg',
|
||||
'gif',
|
||||
'webp',
|
||||
'svg',
|
||||
'mp3',
|
||||
'mp4',
|
||||
'mov',
|
||||
'html',
|
||||
'htm',
|
||||
'css',
|
||||
'exe',
|
||||
'dll',
|
||||
'lock',
|
||||
'cfg',
|
||||
'conf',
|
||||
'ini',
|
||||
'xml',
|
||||
'doc',
|
||||
'docx',
|
||||
'xls',
|
||||
'xlsx',
|
||||
'ppt',
|
||||
'pptx',
|
||||
'apk',
|
||||
'iso',
|
||||
'jar',
|
||||
'java',
|
||||
'go',
|
||||
'rb',
|
||||
'php',
|
||||
'c',
|
||||
'h',
|
||||
'cpp',
|
||||
]);
|
||||
const TRIM_PUNCT = /^[\s"'“”‘’«»([{<]+|[\s"'“”‘’«»)\]}>.,;:!?]+$/g;
|
||||
|
||||
/** Every host a sentence names (Gitea #335), e.g. "Log in at chat.lotusguild.org". */
|
||||
export const hostsFromText = (text: string): string[] => {
|
||||
const hosts: string[] = [];
|
||||
text.split(/\s+/).forEach((raw) => {
|
||||
const word = raw.replace(TRIM_PUNCT, '');
|
||||
const host = word && hostFromText(word);
|
||||
if (!host) return;
|
||||
const tld = host.split('.').pop() ?? '';
|
||||
if (!/[a-z]/i.test(tld)) return; // version numbers, IPs-as-words
|
||||
const urlShaped =
|
||||
/^[a-z][a-z0-9+.-]*:\/\//i.test(word) || /^www\./i.test(word) || word.includes('/');
|
||||
if (!urlShaped && host.split('.').length === 2 && FILE_EXTENSIONS.has(tld.toLowerCase()))
|
||||
return;
|
||||
if (!hosts.includes(host)) hosts.push(host);
|
||||
});
|
||||
return hosts;
|
||||
};
|
||||
|
||||
export type LinkSafety = {
|
||||
/** The visible text names a different site than the destination. */
|
||||
mismatch: boolean;
|
||||
@@ -92,8 +213,11 @@ export const analyzeLink = (text: string, href: string): LinkSafety | null => {
|
||||
if (url.hostname === 'matrix.to') return null;
|
||||
const realHost = url.hostname;
|
||||
const punycode = realHost.split('.').some((l) => l.startsWith('xn--'));
|
||||
const shownHost = hostFromText(text) ?? undefined;
|
||||
const mismatch =
|
||||
shownHost !== undefined && registrableDomain(shownHost) !== registrableDomain(realHost);
|
||||
return { mismatch, shownHost, realHost, punycode };
|
||||
// A single URL/host-shaped text, or (Gitea #335) host-shaped words inside a
|
||||
// sentence: "Log in at chat.lotusguild.org" must not hide a different site.
|
||||
const single = hostFromText(text);
|
||||
const shown = single ? [single] : hostsFromText(text);
|
||||
const realSite = registrableDomain(realHost);
|
||||
const other = shown.find((h) => registrableDomain(h) !== realSite);
|
||||
return { mismatch: other !== undefined, shownHost: other ?? shown[0], realHost, punycode };
|
||||
};
|
||||
|
||||
@@ -48,3 +48,34 @@ test("a fresh local save wins over a server read that hasn't caught up", () => {
|
||||
'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.
|
||||
*/
|
||||
|
||||
/** 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. */
|
||||
export const LOCAL_WRITE_GRACE_MS = 15_000;
|
||||
|
||||
@@ -37,7 +40,12 @@ export const pickHeartbeatStatus = ({
|
||||
lastLocalWriteAt: number;
|
||||
now: number;
|
||||
}): string => {
|
||||
if (!server || server.presence === 'offline') return local;
|
||||
if (now - writtenAt < LOCAL_WRITE_GRACE_MS) return local;
|
||||
// [Gitea #283] Lotus encodes Do Not Disturb as status_msg "dnd", so a device
|
||||
// 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 ?? '';
|
||||
};
|
||||
|
||||
@@ -104,3 +104,9 @@ describe('buildSyncedContent', () => {
|
||||
assert.deepEqual(c.settings, pickSyncable(base));
|
||||
});
|
||||
});
|
||||
|
||||
describe('device-local keys', () => {
|
||||
it('keeps enterForNewline on each device (#348)', () => {
|
||||
assert.equal(DEVICE_LOCAL_KEYS.has('enterForNewline'), true);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -49,6 +49,9 @@ export const DEVICE_LOCAL_KEYS: ReadonlySet<keyof Settings> = new Set<keyof Sett
|
||||
'ringtoneVolume',
|
||||
'soundboardVolume',
|
||||
'cameraOnJoin',
|
||||
// [Gitea #348] Enter = new line suits a phone keyboard, Enter = send a desktop one;
|
||||
// syncing it switched the desktop to Ctrl+Enter when set on the phone.
|
||||
'enterForNewline',
|
||||
]);
|
||||
|
||||
/** The subset of `settings` that is synced (deep-copied so callers can't alias). */
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
import { test } from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { voiceChannelOccupancy } from './voiceChannelFull';
|
||||
|
||||
test('voiceChannelOccupancy: one user on two devices fills one slot, not two', () => {
|
||||
assert.deepEqual(voiceChannelOccupancy(['@a:x', '@a:x'], '@b:x', 2), {
|
||||
channelFull: false,
|
||||
current: 1,
|
||||
max: 2,
|
||||
});
|
||||
});
|
||||
|
||||
test('voiceChannelOccupancy: full when distinct users reach the limit', () => {
|
||||
assert.deepEqual(voiceChannelOccupancy(['@a:x', '@c:x', '@a:x'], '@b:x', 2), {
|
||||
channelFull: true,
|
||||
current: 2,
|
||||
max: 2,
|
||||
});
|
||||
});
|
||||
|
||||
test('voiceChannelOccupancy: someone already in the call can always join another device', () => {
|
||||
assert.equal(voiceChannelOccupancy(['@a:x', '@b:x'], '@b:x', 2).channelFull, false);
|
||||
});
|
||||
|
||||
test('voiceChannelOccupancy: no limit (0) is never full; unknown senders are ignored', () => {
|
||||
assert.equal(voiceChannelOccupancy(['@a:x', '@c:x'], '@b:x', 0).channelFull, false);
|
||||
assert.equal(voiceChannelOccupancy([undefined, '@a:x'], '@b:x', 2).current, 1);
|
||||
});
|
||||
@@ -0,0 +1,25 @@
|
||||
/**
|
||||
* [Gitea #342] Whether a voice channel with an `io.lotus.voice_limit` is full.
|
||||
* Counts distinct PEOPLE, not call memberships: a MatrixRTC membership is per
|
||||
* device, so one user on desktop + phone (or with a crashed tab's membership
|
||||
* not yet expired) used to fill two slots. This matches the server-side guard
|
||||
* (matrix `voice-limit-guard.py`, which reduces LiveKit identities to users).
|
||||
*/
|
||||
export type VoiceChannelOccupancy = {
|
||||
channelFull: boolean;
|
||||
/** Distinct users in the call. */
|
||||
current: number;
|
||||
max: number;
|
||||
};
|
||||
|
||||
export const voiceChannelOccupancy = (
|
||||
memberSenders: Array<string | undefined>,
|
||||
myUserId: string,
|
||||
maxUsers: number,
|
||||
): VoiceChannelOccupancy => {
|
||||
const users = new Set(memberSenders.filter((s): s is string => !!s));
|
||||
// A user already in the call (another device, or rejoining) is never blocked.
|
||||
const alreadyMember = users.has(myUserId);
|
||||
const channelFull = maxUsers > 0 && !alreadyMember && users.size >= maxUsers;
|
||||
return { channelFull, current: users.size, max: maxUsers };
|
||||
};
|
||||
Reference in New Issue
Block a user