Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f30a65eb74 |
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>
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -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.
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { test } from 'node:test';
|
import { test } from 'node:test';
|
||||||
import assert from 'node:assert/strict';
|
import assert from 'node:assert/strict';
|
||||||
import {
|
import {
|
||||||
|
plain,
|
||||||
DEFAULT_GROUPS,
|
DEFAULT_GROUPS,
|
||||||
kumaBeatTime,
|
kumaBeatTime,
|
||||||
kumaUrls,
|
kumaUrls,
|
||||||
@@ -260,3 +261,27 @@ test('a dismissed calls-down banner lets the next one through, never hides serve
|
|||||||
'server-down',
|
'server-down',
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('plain: strips Markdown syntax only, keeps ordinary #, _, > and * (#308)', () => {
|
||||||
|
assert.equal(
|
||||||
|
plain('join #lotus-general or #announcements:lotusguild.org'),
|
||||||
|
'join #lotus-general or #announcements:lotusguild.org',
|
||||||
|
);
|
||||||
|
assert.equal(
|
||||||
|
plain('ping @some_user about snake_case and C#'),
|
||||||
|
'ping @some_user about snake_case and C#',
|
||||||
|
);
|
||||||
|
assert.equal(
|
||||||
|
plain('calls -> fixed, > 5 people, 5 * 3 = 15'),
|
||||||
|
'calls -> fixed, > 5 people, 5 * 3 = 15',
|
||||||
|
);
|
||||||
|
assert.equal(
|
||||||
|
plain('# Heading\n* item one\n- item two\n> quoted'),
|
||||||
|
'Heading\nitem one\nitem two\nquoted',
|
||||||
|
);
|
||||||
|
assert.equal(plain('**bold**, *em*, _em_, `/sfu/get`'), 'bold, em, em, /sfu/get');
|
||||||
|
assert.equal(
|
||||||
|
plain('Read the <b>guide</b> <img src=x onerror=alert(1)> [docs](https://x.y)'),
|
||||||
|
'Read the guide docs',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|||||||
@@ -240,12 +240,25 @@ const incidentTone = (style: string): BannerTone => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/** Markdown-ish incident text as plain text for the Details line. */
|
/** Markdown-ish incident text as plain text for the Details line. */
|
||||||
const plain = (s: string): string =>
|
/**
|
||||||
|
* [Gitea #308] Markdown → plain text for the Details line. Strips only the
|
||||||
|
* syntax: removing every `*_\`#>` also broke "#lotus-general", "snake_case",
|
||||||
|
* "->" and "5 * 3". HTML tags are dropped (React escapes the text anyway).
|
||||||
|
*/
|
||||||
|
export const plain = (s: string): string =>
|
||||||
s
|
s
|
||||||
.replace(/!\[[^\]]*\]\([^)]*\)/g, '')
|
.replace(/!\[[^\]]*\]\([^)]*\)/g, '')
|
||||||
.replace(/\[([^\]]+)\]\([^)]*\)/g, '$1')
|
.replace(/\[([^\]]+)\]\([^)]*\)/g, '$1')
|
||||||
.replace(/[*_`#>]/g, '')
|
.replace(/<\/?[a-z][^>]*>/gi, '')
|
||||||
.replace(/\s+\n/g, '\n')
|
.replace(/^[ \t]{0,3}#{1,6}[ \t]+/gm, '')
|
||||||
|
.replace(/^[ \t]*>[ \t]?/gm, '')
|
||||||
|
.replace(/^[ \t]*[*+-][ \t]+/gm, '')
|
||||||
|
.replace(/`([^`\n]+)`/g, '$1')
|
||||||
|
.replace(/\*\*(?=\S)([^*\n]*?\S)\*\*/g, '$1')
|
||||||
|
.replace(/__(?=\S)([^_\n]*?\S)__/g, '$1')
|
||||||
|
.replace(/(^|[^\w*])\*(?=\S)([^*\n]*?\S)\*(?![\w*])/g, '$1$2')
|
||||||
|
.replace(/(^|[^\w])_(?=\S)([^_\n]*?\S)_(?!\w)/g, '$1$2')
|
||||||
|
.replace(/[ \t]+\n/g, '\n')
|
||||||
.trim();
|
.trim();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user