Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f30a65eb74 |
@@ -6,13 +6,12 @@ import {
|
||||
useCallJoined,
|
||||
useCallEmbedPlacementSync,
|
||||
useCallLoadError,
|
||||
useCallStart,
|
||||
} from '../../hooks/useCallEmbed';
|
||||
import { callEmbedAtom } from '../../state/callEmbed';
|
||||
import { ContainerColor } from '../../styles/ContainerColor.css';
|
||||
import { PrescreenControls } from './PrescreenControls';
|
||||
import { usePowerLevelsContext } from '../../hooks/usePowerLevels';
|
||||
import { useIsDirectRoom, useRoom } from '../../hooks/useRoom';
|
||||
import { useRoom } from '../../hooks/useRoom';
|
||||
import { useRoomCreators } from '../../hooks/useRoomCreators';
|
||||
import { useRoomPermissions } from '../../hooks/useRoomPermissions';
|
||||
import { useMatrixClient } from '../../hooks/useMatrixClient';
|
||||
@@ -161,16 +160,6 @@ function CallLoadErrorMessage() {
|
||||
// prescreen, where they can choose to join again.
|
||||
const dismiss = () => setCallEmbed(undefined);
|
||||
|
||||
// [Gitea #301] Try again: start a fresh embed for the same room with the
|
||||
// same mic/camera/sound choices (starting one disposes the hung one).
|
||||
const callEmbed = useCallEmbed();
|
||||
const startCall = useCallStart(useIsDirectRoom());
|
||||
const retry = () => {
|
||||
if (!callEmbed) return;
|
||||
const { room, control } = callEmbed;
|
||||
startCall(room, { microphone: control.microphone, video: control.video, sound: control.sound });
|
||||
};
|
||||
|
||||
return (
|
||||
<Box
|
||||
className={css.CallViewContent}
|
||||
@@ -184,9 +173,6 @@ function CallLoadErrorMessage() {
|
||||
The call failed to load. Check your connection and try again.
|
||||
</Text>
|
||||
<Box gap="200" alignItems="Center">
|
||||
<Button variant="Primary" size="300" radii="400" onClick={retry} disabled={!callEmbed}>
|
||||
<Text size="B400">Try again</Text>
|
||||
</Button>
|
||||
<Button variant="Secondary" fill="Soft" size="300" radii="400" onClick={dismiss}>
|
||||
<Text size="B400">Back</Text>
|
||||
</Button>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { test } from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import {
|
||||
plain,
|
||||
DEFAULT_GROUPS,
|
||||
kumaBeatTime,
|
||||
kumaUrls,
|
||||
@@ -260,3 +261,27 @@ test('a dismissed calls-down banner lets the next one through, never hides serve
|
||||
'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. */
|
||||
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
|
||||
.replace(/!\[[^\]]*\]\([^)]*\)/g, '')
|
||||
.replace(/\[([^\]]+)\]\([^)]*\)/g, '$1')
|
||||
.replace(/[*_`#>]/g, '')
|
||||
.replace(/\s+\n/g, '\n')
|
||||
.replace(/<\/?[a-z][^>]*>/gi, '')
|
||||
.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();
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user