Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8bbb436ca7 |
Generated
+4
-4
@@ -81,7 +81,7 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@axe-core/playwright": "4.13.0",
|
"@axe-core/playwright": "4.13.0",
|
||||||
"@lotusguild/element-call-embedded": "0.25.0-lotus.23",
|
"@lotusguild/element-call-embedded": "0.25.0-lotus.22",
|
||||||
"@playwright/test": "1.63.0",
|
"@playwright/test": "1.63.0",
|
||||||
"@rollup/plugin-inject": "5.0.5",
|
"@rollup/plugin-inject": "5.0.5",
|
||||||
"@rollup/plugin-wasm": "6.2.2",
|
"@rollup/plugin-wasm": "6.2.2",
|
||||||
@@ -2695,9 +2695,9 @@
|
|||||||
"integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA=="
|
"integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA=="
|
||||||
},
|
},
|
||||||
"node_modules/@lotusguild/element-call-embedded": {
|
"node_modules/@lotusguild/element-call-embedded": {
|
||||||
"version": "0.25.0-lotus.23",
|
"version": "0.25.0-lotus.22",
|
||||||
"resolved": "https://code.lotusguild.org/api/packages/LotusGuild/npm/%40lotusguild%2Felement-call-embedded/-/0.25.0-lotus.23/element-call-embedded-0.25.0-lotus.23.tgz",
|
"resolved": "https://code.lotusguild.org/api/packages/LotusGuild/npm/%40lotusguild%2Felement-call-embedded/-/0.25.0-lotus.22/element-call-embedded-0.25.0-lotus.22.tgz",
|
||||||
"integrity": "sha512-vRmcWeJcU0Accyl2x3mqNEzrIe8djE5BekyYbYOSCsMflC98rZgD1mO7KOe7bA1cX7gparRf6sAt1fotHoU+bA==",
|
"integrity": "sha512-AimDKZA4xUKEEyl2XUFUSUDl03tBKFv88T/3igKyH2VqNSPMGnqcQJC5HXIkHLTWrOmg8kLcJ//FFbqlUZiLcA==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/@matrix-org/matrix-sdk-crypto-wasm": {
|
"node_modules/@matrix-org/matrix-sdk-crypto-wasm": {
|
||||||
|
|||||||
+1
-1
@@ -108,7 +108,7 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@axe-core/playwright": "4.13.0",
|
"@axe-core/playwright": "4.13.0",
|
||||||
"@lotusguild/element-call-embedded": "0.25.0-lotus.23",
|
"@lotusguild/element-call-embedded": "0.25.0-lotus.22",
|
||||||
"@playwright/test": "1.63.0",
|
"@playwright/test": "1.63.0",
|
||||||
"@rollup/plugin-inject": "5.0.5",
|
"@rollup/plugin-inject": "5.0.5",
|
||||||
"@rollup/plugin-wasm": "6.2.2",
|
"@rollup/plugin-wasm": "6.2.2",
|
||||||
|
|||||||
@@ -297,7 +297,7 @@ export function AccountDataEditor({
|
|||||||
</Chip>
|
</Chip>
|
||||||
</Box>
|
</Box>
|
||||||
<Box shrink="No">
|
<Box shrink="No">
|
||||||
<IconButton type="button" onClick={requestClose} variant="Surface" aria-label="Close">
|
<IconButton onClick={requestClose} variant="Surface" aria-label="Close">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -315,7 +315,7 @@ export const DeviceVerificationSetup = forwardRef<HTMLDivElement, DeviceVerifica
|
|||||||
Setup Device Verification
|
Setup Device Verification
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton type="button" size="300" radii="300" onClick={onCancel} aria-label="Cancel">
|
<IconButton size="300" radii="300" onClick={onCancel} aria-label="Cancel">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
@@ -361,7 +361,7 @@ export const DeviceVerificationReset = forwardRef<HTMLDivElement, DeviceVerifica
|
|||||||
Reset Device Verification
|
Reset Device Verification
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton type="button" size="300" radii="300" onClick={onCancel} aria-label="Cancel">
|
<IconButton size="300" radii="300" onClick={onCancel} aria-label="Cancel">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { forwardRef, useCallback } from 'react';
|
import React, { forwardRef, useCallback, useEffect, useState } from 'react';
|
||||||
import { Dialog, Header, config, Box, Text, Button, Spinner, color } from 'folds';
|
import { Dialog, Header, config, Box, Text, Button, Spinner, color } from 'folds';
|
||||||
import { useAtom } from 'jotai';
|
import { useAtom } from 'jotai';
|
||||||
import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
|
import { AsyncStatus, useAsyncCallback } from '../hooks/useAsyncCallback';
|
||||||
@@ -9,6 +9,8 @@ import { useMatrixClient } from '../hooks/useMatrixClient';
|
|||||||
import { useModalStyle } from '../hooks/useModalStyle';
|
import { useModalStyle } from '../hooks/useModalStyle';
|
||||||
import { useCrossSigningActive } from '../hooks/useCrossSigning';
|
import { useCrossSigningActive } from '../hooks/useCrossSigning';
|
||||||
import { InfoCard } from './info-card';
|
import { InfoCard } from './info-card';
|
||||||
|
import { ScheduledMessage } from '../state/scheduledMessages';
|
||||||
|
import { cancelScheduledMessage, fetchScheduledMessages } from '../utils/scheduledMessages';
|
||||||
import {
|
import {
|
||||||
useDeviceVerificationStatus,
|
useDeviceVerificationStatus,
|
||||||
VerificationStatus,
|
VerificationStatus,
|
||||||
@@ -36,17 +38,36 @@ export const LogoutDialog = forwardRef<HTMLDivElement, LogoutDialogProps>(
|
|||||||
|
|
||||||
const [callEmbed, setCallEmbed] = useAtom(callEmbedAtom);
|
const [callEmbed, setCallEmbed] = useAtom(callEmbedAtom);
|
||||||
|
|
||||||
const [logoutState, logout] = useAsyncCallback<void, Error, []>(
|
// [Gitea #322] Scheduled messages live on the server and still send after
|
||||||
useCallback(async () => {
|
// logout, where no client would show them. Say so, and offer to cancel.
|
||||||
// [Gitea #29] Logging out mid-call must hang up first, or the MatrixRTC
|
const [scheduled, setScheduled] = useState<ScheduledMessage[]>([]);
|
||||||
// membership (expires: 4 h) stays behind as a ghost participant and
|
useEffect(() => {
|
||||||
// everyone else sees you "in call" until it times out.
|
let alive = true;
|
||||||
if (callEmbed && callEmbed.joined && !callEmbed.disposed) {
|
fetchScheduledMessages(mx)
|
||||||
await hangupCallAndWait(mx, callEmbed);
|
.then((list) => alive && setScheduled(list))
|
||||||
setCallEmbed(undefined);
|
.catch(() => undefined);
|
||||||
}
|
return () => {
|
||||||
await logoutClient(mx);
|
alive = false;
|
||||||
}, [mx, callEmbed, setCallEmbed]),
|
};
|
||||||
|
}, [mx]);
|
||||||
|
|
||||||
|
const [logoutState, logout] = useAsyncCallback<void, Error, [boolean?]>(
|
||||||
|
useCallback(
|
||||||
|
async (cancelScheduled?: boolean) => {
|
||||||
|
if (cancelScheduled) {
|
||||||
|
await Promise.all(scheduled.map((m) => cancelScheduledMessage(mx, m.delayId)));
|
||||||
|
}
|
||||||
|
// [Gitea #29] Logging out mid-call must hang up first, or the MatrixRTC
|
||||||
|
// membership (expires: 4 h) stays behind as a ghost participant and
|
||||||
|
// everyone else sees you "in call" until it times out.
|
||||||
|
if (callEmbed && callEmbed.joined && !callEmbed.disposed) {
|
||||||
|
await hangupCallAndWait(mx, callEmbed);
|
||||||
|
setCallEmbed(undefined);
|
||||||
|
}
|
||||||
|
await logoutClient(mx);
|
||||||
|
},
|
||||||
|
[mx, callEmbed, setCallEmbed, scheduled],
|
||||||
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
const ongoingLogout = logoutState.status === AsyncStatus.Loading;
|
const ongoingLogout = logoutState.status === AsyncStatus.Loading;
|
||||||
@@ -93,6 +114,13 @@ export const LogoutDialog = forwardRef<HTMLDivElement, LogoutDialogProps>(
|
|||||||
description="Enable device verification or export your encrypted data from settings to avoid losing access to your messages."
|
description="Enable device verification or export your encrypted data from settings to avoid losing access to your messages."
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
|
{scheduled.length > 0 && (
|
||||||
|
<InfoCard
|
||||||
|
variant="Warning"
|
||||||
|
title={`${scheduled.length} scheduled message${scheduled.length === 1 ? '' : 's'}`}
|
||||||
|
description="Scheduled messages still send after you log out. Cancel them now if you don't want them sent."
|
||||||
|
/>
|
||||||
|
)}
|
||||||
<Text priority="400">You’re about to log out. Are you sure?</Text>
|
<Text priority="400">You’re about to log out. Are you sure?</Text>
|
||||||
{logoutState.status === AsyncStatus.Error && (
|
{logoutState.status === AsyncStatus.Error && (
|
||||||
<Text style={{ color: color.Critical.Main }} size="T300">
|
<Text style={{ color: color.Critical.Main }} size="T300">
|
||||||
@@ -102,12 +130,24 @@ export const LogoutDialog = forwardRef<HTMLDivElement, LogoutDialogProps>(
|
|||||||
<Box direction="Column" gap="200">
|
<Box direction="Column" gap="200">
|
||||||
<Button
|
<Button
|
||||||
variant="Critical"
|
variant="Critical"
|
||||||
onClick={logout}
|
onClick={() => logout()}
|
||||||
disabled={ongoingLogout}
|
disabled={ongoingLogout}
|
||||||
before={ongoingLogout && <Spinner variant="Critical" fill="Solid" size="200" />}
|
before={ongoingLogout && <Spinner variant="Critical" fill="Solid" size="200" />}
|
||||||
>
|
>
|
||||||
<Text size="B400">Logout</Text>
|
<Text size="B400">
|
||||||
|
{scheduled.length > 0 ? 'Logout and keep scheduled messages' : 'Logout'}
|
||||||
|
</Text>
|
||||||
</Button>
|
</Button>
|
||||||
|
{scheduled.length > 0 && (
|
||||||
|
<Button
|
||||||
|
variant="Critical"
|
||||||
|
fill="Soft"
|
||||||
|
onClick={() => logout(true)}
|
||||||
|
disabled={ongoingLogout}
|
||||||
|
>
|
||||||
|
<Text size="B400">Cancel scheduled messages and logout</Text>
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
<Button variant="Secondary" fill="Soft" onClick={handleClose} disabled={ongoingLogout}>
|
<Button variant="Secondary" fill="Soft" onClick={handleClose} disabled={ongoingLogout}>
|
||||||
<Text size="B400">Cancel</Text>
|
<Text size="B400">Cancel</Text>
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -139,11 +139,8 @@ export const createRoom = async (mx: MatrixClient, data: CreateRoomData): Promis
|
|||||||
data.allowFederation,
|
data.allowFederation,
|
||||||
data.additionalCreators,
|
data.additionalCreators,
|
||||||
),
|
),
|
||||||
// [Gitea #328] Every non-space room gets call.member at user level, not just
|
power_level_content_override:
|
||||||
// voice rooms: the call button is shown in private group rooms too, and with
|
data.type === RoomType.Call ? createVoiceRoomPowerLevelsOverride() : undefined,
|
||||||
// Synapse's state_default (50) only admins could start or join a call there
|
|
||||||
// ("You don't have permission to join!").
|
|
||||||
power_level_content_override: createVoiceRoomPowerLevelsOverride(),
|
|
||||||
initial_state: initialState,
|
initial_state: initialState,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -43,9 +43,7 @@ export function SettingTile({ title, description, before, after, children }: Set
|
|||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
{description && (
|
{description && (
|
||||||
// [Gitea #291] A <div>, not a <p>: many tiles pass blocks (badges,
|
<Text className={BreakWord} size="T200" priority="300">
|
||||||
// <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,13 +310,9 @@ export function UploadCardRenderer({
|
|||||||
const { file } = upload;
|
const { file } = upload;
|
||||||
const fileSizeExceeded = file.size >= allowSize;
|
const fileSizeExceeded = file.size >= allowSize;
|
||||||
|
|
||||||
// [Gitea #291] Start in an effect, not during render: the desktop taskbar
|
if (upload.status === UploadStatus.Idle && !fileSizeExceeded) {
|
||||||
// progress hook subscribes to the upload atoms, so a render-time start
|
startUpload();
|
||||||
// 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 });
|
||||||
|
|||||||
@@ -275,7 +275,7 @@ export function StateEventEditor({ type, stateKey, requestClose }: StateEventEdi
|
|||||||
</Chip>
|
</Chip>
|
||||||
</Box>
|
</Box>
|
||||||
<Box shrink="No">
|
<Box shrink="No">
|
||||||
<IconButton type="button" onClick={requestClose} variant="Surface" aria-label="Close">
|
<IconButton onClick={requestClose} variant="Surface" aria-label="Close">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ export function PollCreator({ roomId, threadRootId, onClose }: PollCreatorProps)
|
|||||||
Create Poll
|
Create Poll
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton type="button" size="300" radii="300" onClick={onClose} aria-label="Close">
|
<IconButton size="300" radii="300" onClick={onClose} aria-label="Close">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ export function ReportRoomModal({ roomId, onClose }: ReportRoomModalProps) {
|
|||||||
Report Room
|
Report Room
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton type="button" size="300" onClick={onClose} radii="300" aria-label="Close">
|
<IconButton size="300" onClick={onClose} radii="300" aria-label="Close">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ export function ReportUserModal({ userId, onClose }: ReportUserModalProps) {
|
|||||||
Report User
|
Report User
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton type="button" size="300" onClick={onClose} radii="300" aria-label="Close">
|
<IconButton size="300" onClick={onClose} radii="300" aria-label="Close">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
|
|||||||
@@ -202,7 +202,7 @@ export function ScheduleMessageModal({
|
|||||||
{title}
|
{title}
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton type="button" size="300" radii="300" onClick={onClose} aria-label="Close">
|
<IconButton size="300" radii="300" onClick={onClose} aria-label="Close">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
|
|||||||
@@ -4,7 +4,12 @@ import { IContent } from 'matrix-js-sdk';
|
|||||||
import { Box, Button, Icon, IconButton, Icons, Text, color, config } from 'folds';
|
import { Box, Button, Icon, IconButton, Icons, Text, color, config } from 'folds';
|
||||||
import { useMatrixClient } from '../../hooks/useMatrixClient';
|
import { useMatrixClient } from '../../hooks/useMatrixClient';
|
||||||
import { scheduledMessagesAtom, ScheduledMessage } from '../../state/scheduledMessages';
|
import { scheduledMessagesAtom, ScheduledMessage } from '../../state/scheduledMessages';
|
||||||
import { cancelScheduledMessage, sendScheduledMessageNow } from '../../utils/scheduledMessages';
|
import {
|
||||||
|
cancelScheduledMessage,
|
||||||
|
fetchScheduledMessages,
|
||||||
|
groupScheduledByRoom,
|
||||||
|
sendScheduledMessageNow,
|
||||||
|
} from '../../utils/scheduledMessages';
|
||||||
import { ScheduleMessageModal } from './ScheduleMessageModal';
|
import { ScheduleMessageModal } from './ScheduleMessageModal';
|
||||||
import { useTimestampFormatter } from '../../hooks/useTimestampFormatter';
|
import { useTimestampFormatter } from '../../hooks/useTimestampFormatter';
|
||||||
import { formatFriendlyDateTime } from '../../utils/datetimeInput';
|
import { formatFriendlyDateTime } from '../../utils/datetimeInput';
|
||||||
@@ -26,6 +31,26 @@ export function ScheduledMessagesTray({ roomId }: ScheduledMessagesTrayProps) {
|
|||||||
|
|
||||||
const messages = useMemo(() => scheduledMessages.get(roomId) ?? [], [scheduledMessages, roomId]);
|
const messages = useMemo(() => scheduledMessages.get(roomId) ?? [], [scheduledMessages, roomId]);
|
||||||
|
|
||||||
|
// [Gitea #322] The server is the source of truth: messages scheduled on
|
||||||
|
// another device (or before a logout) show up here and can be cancelled.
|
||||||
|
// localStorage is only a cache for the first paint; on error we keep it.
|
||||||
|
useEffect(() => {
|
||||||
|
let alive = true;
|
||||||
|
const load = () => {
|
||||||
|
fetchScheduledMessages(mx)
|
||||||
|
.then((list) => {
|
||||||
|
if (alive) setScheduledMessages(groupScheduledByRoom(list));
|
||||||
|
})
|
||||||
|
.catch(() => undefined);
|
||||||
|
};
|
||||||
|
load();
|
||||||
|
window.addEventListener('focus', load);
|
||||||
|
return () => {
|
||||||
|
alive = false;
|
||||||
|
window.removeEventListener('focus', load);
|
||||||
|
};
|
||||||
|
}, [mx, roomId, setScheduledMessages]);
|
||||||
|
|
||||||
// Remove scheduled messages whose time has passed
|
// Remove scheduled messages whose time has passed
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (messages.length === 0) return undefined;
|
if (messages.length === 0) return undefined;
|
||||||
|
|||||||
@@ -725,13 +725,7 @@ export const MessageDeleteItem = as<
|
|||||||
Delete Message
|
Delete Message
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton
|
<IconButton size="300" onClick={handleClose} radii="300" aria-label="Close">
|
||||||
type="button"
|
|
||||||
size="300"
|
|
||||||
onClick={handleClose}
|
|
||||||
radii="300"
|
|
||||||
aria-label="Close"
|
|
||||||
>
|
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
@@ -871,13 +865,7 @@ export const MessageReportItem = as<
|
|||||||
Report Message
|
Report Message
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton
|
<IconButton size="300" onClick={handleClose} radii="300" aria-label="Close">
|
||||||
type="button"
|
|
||||||
size="300"
|
|
||||||
onClick={handleClose}
|
|
||||||
radii="300"
|
|
||||||
aria-label="Close"
|
|
||||||
>
|
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
|
|||||||
@@ -69,15 +69,8 @@ export const Reactions = as<'div', ReactionsProps>(
|
|||||||
const measure = useCallback(() => {
|
const measure = useCallback(() => {
|
||||||
const container = containerRef.current;
|
const container = containerRef.current;
|
||||||
if (!container) return;
|
if (!container) return;
|
||||||
// [Gitea #305] The width the chips actually get (content box). The border
|
const rowWidth = container.getBoundingClientRect().width;
|
||||||
// box grows by 4 px while collapsed (margin -2 / padding 2), and measuring
|
const gap = parseFloat(getComputedStyle(container).columnGap) || 8;
|
||||||
// it made a row within 4 px of fitting flip collapsed↔expanded every frame.
|
|
||||||
const cs = getComputedStyle(container);
|
|
||||||
const rowWidth =
|
|
||||||
container.clientWidth -
|
|
||||||
(parseFloat(cs.paddingLeft) || 0) -
|
|
||||||
(parseFloat(cs.paddingRight) || 0);
|
|
||||||
const gap = parseFloat(cs.columnGap) || 8;
|
|
||||||
const chips = keys ? keys.split('\u0000').map((k) => chipRefs.current.get(k)) : [];
|
const chips = keys ? keys.split('\u0000').map((k) => chipRefs.current.get(k)) : [];
|
||||||
const widths = chips.map((el) => el?.getBoundingClientRect().width ?? 0);
|
const widths = chips.map((el) => el?.getBoundingClientRect().width ?? 0);
|
||||||
const moreWidth = moreRef.current?.getBoundingClientRect().width ?? 48;
|
const moreWidth = moreRef.current?.getBoundingClientRect().width ?? 48;
|
||||||
@@ -117,21 +110,8 @@ export const Reactions = as<'div', ReactionsProps>(
|
|||||||
style={{
|
style={{
|
||||||
...props.style,
|
...props.style,
|
||||||
...(collapsed && rowHeight
|
...(collapsed && rowHeight
|
||||||
? // 2px breathing room so row-1 focus outlines are not clipped. Longhand
|
? // 2px breathing room so row-1 focus outlines are not clipped.
|
||||||
// margins so the timeline's marginTop survives (Gitea #305: the
|
{ maxHeight: rowHeight + 4, overflow: 'hidden', padding: 2, margin: -2 }
|
||||||
// `margin` shorthand overrode it and, once removed, cleared it).
|
|
||||||
{
|
|
||||||
maxHeight: rowHeight + 4,
|
|
||||||
overflow: 'hidden',
|
|
||||||
padding: 2,
|
|
||||||
marginLeft: -2,
|
|
||||||
marginRight: -2,
|
|
||||||
marginBottom: -2,
|
|
||||||
marginTop:
|
|
||||||
props.style?.marginTop !== undefined
|
|
||||||
? `calc(${typeof props.style.marginTop === 'number' ? `${props.style.marginTop}px` : props.style.marginTop} - 2px)`
|
|
||||||
: -2,
|
|
||||||
}
|
|
||||||
: {}),
|
: {}),
|
||||||
}}
|
}}
|
||||||
ref={(el) => {
|
ref={(el) => {
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ import { verifyDenoiseAssets } from './denoiseSmokeCheck';
|
|||||||
import { canDelegateCapability } from './utils';
|
import { canDelegateCapability } from './utils';
|
||||||
import { getCallPageUrl } from './callPageUrl';
|
import { getCallPageUrl } from './callPageUrl';
|
||||||
import { restrictWidgetMessages } from '../widgetTransport';
|
import { restrictWidgetMessages } from '../widgetTransport';
|
||||||
import { isRingableRoom } from '../../utils/callRing';
|
|
||||||
|
|
||||||
// Maximum time to wait for the embedded Element Call iframe to progress from
|
// Maximum time to wait for the embedded Element Call iframe to progress from
|
||||||
// initial load to a ready/joined state. If it hasn't by then, we assume the
|
// initial load to a ready/joined state. If it hasn't by then, we assume the
|
||||||
@@ -252,18 +251,8 @@ export class CallEmbed {
|
|||||||
verifyDenoiseAssets(denoiseModel).catch(() => undefined);
|
verifyDenoiseAssets(denoiseModel).catch(() => undefined);
|
||||||
}
|
}
|
||||||
|
|
||||||
// [Gitea #295] Only ask Element Call to notify where a call can ring at all
|
|
||||||
// (DMs, invite-only groups outside a space). In a voice channel or space
|
|
||||||
// room the notification carries an @room mention, so every member got a
|
|
||||||
// highlighted ping (and phone push) whenever a moderator hopped in, and
|
|
||||||
// other clients showed it as a missed call.
|
|
||||||
// `none` needs element-call-embedded ≥ 0.25.0-lotus.23 (older builds ignore it).
|
|
||||||
if (CallEmbed.startingCall(intent)) {
|
if (CallEmbed.startingCall(intent)) {
|
||||||
let notify = 'none';
|
params.append('sendNotificationType', CallEmbed.dmCall(intent) ? 'ring' : 'notification');
|
||||||
if (isRingableRoom(room, CallEmbed.dmCall(intent))) {
|
|
||||||
notify = CallEmbed.dmCall(intent) ? 'ring' : 'notification';
|
|
||||||
}
|
|
||||||
params.append('sendNotificationType', notify);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// [Gitea #43] On its own origin when config.json sets elementCallUrl.
|
// [Gitea #43] On its own origin when config.json sets elementCallUrl.
|
||||||
|
|||||||
@@ -21,8 +21,8 @@ const internalAtom = atomWithStorage<Record<string, ScheduledMessage[]>>(
|
|||||||
/**
|
/**
|
||||||
* Global atom: Map<roomId, ScheduledMessage[]>
|
* Global atom: Map<roomId, ScheduledMessage[]>
|
||||||
* Stores all locally-tracked scheduled messages across rooms.
|
* Stores all locally-tracked scheduled messages across rooms.
|
||||||
* MSC4140 has no list endpoint, so we track them ourselves.
|
* Loaded from the server's MSC4140 `GET /delayed_events` when the tray mounts
|
||||||
* Backed by localStorage so scheduled messages survive page refreshes.
|
* (Gitea #322); localStorage is a cache for the first paint.
|
||||||
*/
|
*/
|
||||||
export const scheduledMessagesAtom = atom(
|
export const scheduledMessagesAtom = atom(
|
||||||
(get): Map<string, ScheduledMessage[]> => new Map(Object.entries(get(internalAtom))),
|
(get): Map<string, ScheduledMessage[]> => new Map(Object.entries(get(internalAtom))),
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ import {
|
|||||||
scheduleMessage,
|
scheduleMessage,
|
||||||
cancelScheduledMessage,
|
cancelScheduledMessage,
|
||||||
restartScheduledMessage,
|
restartScheduledMessage,
|
||||||
|
parseDelayedEvents,
|
||||||
|
groupScheduledByRoom,
|
||||||
} from './scheduledMessages';
|
} from './scheduledMessages';
|
||||||
|
|
||||||
// Minimal MatrixClient stub: records every authedRequest call and returns a
|
// Minimal MatrixClient stub: records every authedRequest call and returns a
|
||||||
@@ -119,3 +121,61 @@ test('cancel/restart url-encode the delay id', async () => {
|
|||||||
await cancelScheduledMessage(mx, 'a/b c');
|
await cancelScheduledMessage(mx, 'a/b c');
|
||||||
assert.equal(calls[0][1], '/delayed_events/a%2Fb%20c');
|
assert.equal(calls[0][1], '/delayed_events/a%2Fb%20c');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('parseDelayedEvents: Synapse shape, messages only, sendAt from running_since + delay (#322)', () => {
|
||||||
|
const res = {
|
||||||
|
delayed_events: [
|
||||||
|
{
|
||||||
|
delay_id: 'syd_a',
|
||||||
|
room_id: '!r:x',
|
||||||
|
type: 'm.room.message',
|
||||||
|
content: { msgtype: 'm.text', body: 'hi' },
|
||||||
|
delay: 60000,
|
||||||
|
running_since: 1000,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
delay_id: 'syd_call',
|
||||||
|
room_id: '!r:x',
|
||||||
|
type: 'org.matrix.msc3401.call.member',
|
||||||
|
state_key: '_@a:x_D',
|
||||||
|
content: {},
|
||||||
|
delay: 8000,
|
||||||
|
running_since: 1000,
|
||||||
|
},
|
||||||
|
{ delay_id: 'syd_bad', room_id: '!r:x', type: 'm.room.message', content: {} },
|
||||||
|
null,
|
||||||
|
],
|
||||||
|
};
|
||||||
|
assert.deepEqual(parseDelayedEvents(res), [
|
||||||
|
{ delayId: 'syd_a', roomId: '!r:x', content: { msgtype: 'm.text', body: 'hi' }, sendAt: 61000 },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('parseDelayedEvents: MSC `scheduled` shape and garbage', () => {
|
||||||
|
const item = {
|
||||||
|
delay_id: 'd',
|
||||||
|
room_id: '!r:x',
|
||||||
|
type: 'm.room.message',
|
||||||
|
content: { body: 'b' },
|
||||||
|
delay_ms: 5,
|
||||||
|
delayed_since_ts: 10,
|
||||||
|
};
|
||||||
|
assert.equal(parseDelayedEvents({ scheduled: [item] })[0].sendAt, 15);
|
||||||
|
assert.deepEqual(parseDelayedEvents(undefined), []);
|
||||||
|
assert.deepEqual(parseDelayedEvents({ delayed_events: 'nope' }), []);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('groupScheduledByRoom: groups and sorts by sendAt', () => {
|
||||||
|
const m = (delayId: string, roomId: string, sendAt: number) => ({
|
||||||
|
delayId,
|
||||||
|
roomId,
|
||||||
|
content: {},
|
||||||
|
sendAt,
|
||||||
|
});
|
||||||
|
const g = groupScheduledByRoom([m('b', '!1', 20), m('a', '!1', 10), m('c', '!2', 5)]);
|
||||||
|
assert.deepEqual(
|
||||||
|
g.get('!1')?.map((x) => x.delayId),
|
||||||
|
['a', 'b'],
|
||||||
|
);
|
||||||
|
assert.equal(g.get('!2')?.length, 1);
|
||||||
|
});
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { IContent, MatrixClient, Method } from 'matrix-js-sdk';
|
import { IContent, MatrixClient, Method } from 'matrix-js-sdk';
|
||||||
|
import type { ScheduledMessage } from '../state/scheduledMessages';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Schedule a message via MSC4140 (delayed messages).
|
* Schedule a message via MSC4140 (delayed messages).
|
||||||
@@ -76,3 +77,61 @@ export async function sendScheduledMessageNow(mx: MatrixClient, delayId: string)
|
|||||||
{ prefix: '/_matrix/client/unstable/org.matrix.msc4140' },
|
{ prefix: '/_matrix/client/unstable/org.matrix.msc4140' },
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type DelayedEventItem = {
|
||||||
|
delay_id?: unknown;
|
||||||
|
room_id?: unknown;
|
||||||
|
type?: unknown;
|
||||||
|
state_key?: unknown;
|
||||||
|
content?: unknown;
|
||||||
|
delay?: unknown;
|
||||||
|
delay_ms?: unknown;
|
||||||
|
running_since?: unknown;
|
||||||
|
delayed_since_ts?: unknown;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #322] Pure: the user's pending scheduled messages from an MSC4140
|
||||||
|
* `GET /delayed_events` response. Synapse answers `{ delayed_events: [...] }`;
|
||||||
|
* the current MSC shape is `{ scheduled: [...] }`. Call-membership delayed
|
||||||
|
* events share the endpoint, so only non-state `m.room.message`s are kept.
|
||||||
|
*/
|
||||||
|
export function parseDelayedEvents(res: unknown): ScheduledMessage[] {
|
||||||
|
if (!res || typeof res !== 'object') return [];
|
||||||
|
const r = res as { delayed_events?: unknown; scheduled?: unknown };
|
||||||
|
const list = Array.isArray(r.delayed_events) ? r.delayed_events : r.scheduled;
|
||||||
|
if (!Array.isArray(list)) return [];
|
||||||
|
const out: ScheduledMessage[] = [];
|
||||||
|
list.forEach((raw: DelayedEventItem) => {
|
||||||
|
if (!raw || typeof raw !== 'object') return;
|
||||||
|
if (raw.type !== 'm.room.message' || raw.state_key !== undefined) return;
|
||||||
|
if (typeof raw.delay_id !== 'string' || typeof raw.room_id !== 'string') return;
|
||||||
|
if (!raw.content || typeof raw.content !== 'object') return;
|
||||||
|
const delay = Number(raw.delay ?? raw.delay_ms);
|
||||||
|
const since = Number(raw.running_since ?? raw.delayed_since_ts);
|
||||||
|
if (!Number.isFinite(delay) || !Number.isFinite(since)) return;
|
||||||
|
out.push({
|
||||||
|
delayId: raw.delay_id,
|
||||||
|
roomId: raw.room_id,
|
||||||
|
content: raw.content as IContent,
|
||||||
|
sendAt: since + delay,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The user's pending scheduled messages, as the server has them. */
|
||||||
|
export async function fetchScheduledMessages(mx: MatrixClient): Promise<ScheduledMessage[]> {
|
||||||
|
const res = await mx.http.authedRequest(Method.Get, '/delayed_events', undefined, undefined, {
|
||||||
|
prefix: '/_matrix/client/unstable/org.matrix.msc4140',
|
||||||
|
});
|
||||||
|
return parseDelayedEvents(res);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Group by room, the shape of `scheduledMessagesAtom`. */
|
||||||
|
export function groupScheduledByRoom(msgs: ScheduledMessage[]): Map<string, ScheduledMessage[]> {
|
||||||
|
const map = new Map<string, ScheduledMessage[]>();
|
||||||
|
msgs.forEach((m) => map.set(m.roomId, [...(map.get(m.roomId) ?? []), m]));
|
||||||
|
map.forEach((list) => list.sort((a, b) => a.sendAt - b.sendAt));
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user