Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
72277399f0 | ||
|
|
e1168f47bb | ||
|
|
f5a184e428 | ||
|
|
a5471a0576 | ||
|
|
ce1354ed93 | ||
|
|
adf94d7bc1 |
@@ -52,8 +52,7 @@ import { settingsAtom } from '../../../state/settings';
|
|||||||
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
|
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
|
||||||
import { useAlive } from '../../../hooks/useAlive';
|
import { useAlive } from '../../../hooks/useAlive';
|
||||||
import { RoomPermissionsAPI } from '../../../hooks/useRoomPermissions';
|
import { RoomPermissionsAPI } from '../../../hooks/useRoomPermissions';
|
||||||
|
import { buildTopicContent } from '../../../utils/topicMarkdown';
|
||||||
const MARKDOWN_PATTERN = /(\*\*|__|\*|_|~~|`|\[.+?\]\(.+?\))/;
|
|
||||||
|
|
||||||
function wrapSelection(textarea: HTMLTextAreaElement, syntax: string, placeholder: string) {
|
function wrapSelection(textarea: HTMLTextAreaElement, syntax: string, placeholder: string) {
|
||||||
const start = textarea.selectionStart;
|
const start = textarea.selectionStart;
|
||||||
@@ -71,30 +70,6 @@ function wrapSelection(textarea: HTMLTextAreaElement, syntax: string, placeholde
|
|||||||
textarea.setSelectionRange(cursorStart, cursorEnd);
|
textarea.setSelectionRange(cursorStart, cursorEnd);
|
||||||
}
|
}
|
||||||
|
|
||||||
function topicMarkdownToHtml(text: string): string {
|
|
||||||
return text
|
|
||||||
.replace(/&/g, '&')
|
|
||||||
.replace(/</g, '<')
|
|
||||||
.replace(/>/g, '>')
|
|
||||||
.replace(/\*\*(.+?)\*\*/g, '<strong>$1</strong>')
|
|
||||||
.replace(/__(.+?)__/g, '<strong>$1</strong>')
|
|
||||||
.replace(/\*(.+?)\*/g, '<em>$1</em>')
|
|
||||||
.replace(/_(.+?)_/g, '<em>$1</em>')
|
|
||||||
.replace(/~~(.+?)~~/g, '<del>$1</del>')
|
|
||||||
.replace(/`(.+?)`/g, '<code>$1</code>')
|
|
||||||
.replace(/\[(.+?)\]\((.+?)\)/g, '<a href="$2">$1</a>')
|
|
||||||
.replace(/\n/g, '<br>');
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildTopicContent(topic: string): Record<string, string> {
|
|
||||||
if (!MARKDOWN_PATTERN.test(topic)) return { topic };
|
|
||||||
const formattedBody = topicMarkdownToHtml(topic);
|
|
||||||
// Use HTML-stripped text as the plain topic so the header shows clean text, not raw markdown syntax
|
|
||||||
const plainTopic = formattedBody.replace(/<br>/g, '\n').replace(/<[^>]+>/g, '');
|
|
||||||
|
|
||||||
return { topic: plainTopic, format: 'org.matrix.custom.html', formatted_body: formattedBody };
|
|
||||||
}
|
|
||||||
|
|
||||||
type RoomProfileEditProps = {
|
type RoomProfileEditProps = {
|
||||||
canEditAvatar: boolean;
|
canEditAvatar: boolean;
|
||||||
canEditName: boolean;
|
canEditName: boolean;
|
||||||
|
|||||||
@@ -32,24 +32,12 @@ import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
|
|||||||
import { SequenceCard } from '../../components/sequence-card';
|
import { SequenceCard } from '../../components/sequence-card';
|
||||||
import { SequenceCardStyle } from '../common-settings/styles.css';
|
import { SequenceCardStyle } from '../common-settings/styles.css';
|
||||||
import { stopPropagation } from '../../utils/keyboard';
|
import { stopPropagation } from '../../utils/keyboard';
|
||||||
import { isValidServerPattern, matchesAnyGlob } from '../../utils/serverAcl';
|
import { isValidServerPattern, matchesAnyGlob, normalizeServerAcl } from '../../utils/serverAcl';
|
||||||
import { MobileTouchTarget } from '../../styles/mobile.css';
|
import { MobileTouchTarget } from '../../styles/mobile.css';
|
||||||
import { useModalStyle } from '../../hooks/useModalStyle';
|
import { useModalStyle } from '../../hooks/useModalStyle';
|
||||||
|
|
||||||
// ── Types ─────────────────────────────────────────────────────────────────────
|
// ── Types ─────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
type ServerAclContent = {
|
|
||||||
allow: string[];
|
|
||||||
deny: string[];
|
|
||||||
allow_ip_literals: boolean;
|
|
||||||
};
|
|
||||||
|
|
||||||
const DEFAULT_ACL: ServerAclContent = {
|
|
||||||
allow: ['*'],
|
|
||||||
deny: [],
|
|
||||||
allow_ip_literals: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
// ── Server list sub-component ─────────────────────────────────────────────────
|
// ── Server list sub-component ─────────────────────────────────────────────────
|
||||||
|
|
||||||
type ServerListProps = {
|
type ServerListProps = {
|
||||||
@@ -185,20 +173,20 @@ export function RoomServerACL({ requestClose }: RoomServerACLProps) {
|
|||||||
|
|
||||||
// Read current ACL from room state
|
// Read current ACL from room state
|
||||||
const aclEvent = useStateEvent(room, StateEvent.RoomServerAcl);
|
const aclEvent = useStateEvent(room, StateEvent.RoomServerAcl);
|
||||||
const currentAcl = aclEvent?.getContent<ServerAclContent>() ?? DEFAULT_ACL;
|
const currentAcl = normalizeServerAcl(aclEvent?.getContent());
|
||||||
|
|
||||||
// Local draft state — initialised from current ACL
|
// Local draft state — initialised from current ACL
|
||||||
const [allowList, setAllowList] = useState<string[]>(() => currentAcl.allow ?? ['*']);
|
const [allowList, setAllowList] = useState<string[]>(() => currentAcl.allow);
|
||||||
const [denyList, setDenyList] = useState<string[]>(() => currentAcl.deny ?? []);
|
const [denyList, setDenyList] = useState<string[]>(() => currentAcl.deny);
|
||||||
const [allowIpLiterals, setAllowIpLiterals] = useState<boolean>(
|
const [allowIpLiterals, setAllowIpLiterals] = useState<boolean>(
|
||||||
() => currentAcl.allow_ip_literals ?? false,
|
() => currentAcl.allow_ip_literals,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Track whether there are unsaved changes
|
// Track whether there are unsaved changes
|
||||||
const isDirty =
|
const isDirty =
|
||||||
JSON.stringify(allowList) !== JSON.stringify(currentAcl.allow ?? ['*']) ||
|
JSON.stringify(allowList) !== JSON.stringify(currentAcl.allow) ||
|
||||||
JSON.stringify(denyList) !== JSON.stringify(currentAcl.deny ?? []) ||
|
JSON.stringify(denyList) !== JSON.stringify(currentAcl.deny) ||
|
||||||
allowIpLiterals !== (currentAcl.allow_ip_literals ?? false);
|
allowIpLiterals !== currentAcl.allow_ip_literals;
|
||||||
|
|
||||||
// Save handler
|
// Save handler
|
||||||
const [saveState, save] = useAsyncCallback(
|
const [saveState, save] = useAsyncCallback(
|
||||||
@@ -336,7 +324,10 @@ export function RoomServerACL({ requestClose }: RoomServerACLProps) {
|
|||||||
id="allow-ip-literals"
|
id="allow-ip-literals"
|
||||||
checked={allowIpLiterals}
|
checked={allowIpLiterals}
|
||||||
disabled={!canEdit}
|
disabled={!canEdit}
|
||||||
onClick={() => setAllowIpLiterals(!allowIpLiterals)}
|
// folds' Checkbox has no onChange; readOnly tells React the
|
||||||
|
// click handler controls it (no "checked without onChange").
|
||||||
|
readOnly
|
||||||
|
onClick={(e) => setAllowIpLiterals(e.currentTarget.checked)}
|
||||||
size="300"
|
size="300"
|
||||||
variant="Primary"
|
variant="Primary"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import { getOriginBaseUrl, withOriginBaseUrl } from '../../../pages/pathUtils';
|
|||||||
import pkg from '../../../../../package.json';
|
import pkg from '../../../../../package.json';
|
||||||
import { clearCacheAndReload } from '../../../../client/initMatrix';
|
import { clearCacheAndReload } from '../../../../client/initMatrix';
|
||||||
import { useMatrixClient } from '../../../hooks/useMatrixClient';
|
import { useMatrixClient } from '../../../hooks/useMatrixClient';
|
||||||
|
import { tauriInvoke } from '../../../hooks/useTauri';
|
||||||
|
|
||||||
const LotusLogo = withOriginBaseUrl(getOriginBaseUrl(), '/public/res/lotus-logo.png');
|
const LotusLogo = withOriginBaseUrl(getOriginBaseUrl(), '/public/res/lotus-logo.png');
|
||||||
|
|
||||||
@@ -78,6 +79,51 @@ function useServerSupport(): { support: MSC1929Support | null; loading: boolean
|
|||||||
type AboutProps = {
|
type AboutProps = {
|
||||||
requestClose: () => void;
|
requestClose: () => void;
|
||||||
};
|
};
|
||||||
|
/**
|
||||||
|
* [Gitea #276] Which build someone is on: the web deploy's commit and build
|
||||||
|
* date (stamped in by vite.config.js), plus the desktop app's own version from
|
||||||
|
* Tauri, the number a desktop or updater bug report needs.
|
||||||
|
*/
|
||||||
|
function BuildInfo() {
|
||||||
|
const [desktopVersion, setDesktopVersion] = useState<string>();
|
||||||
|
useEffect(() => {
|
||||||
|
tauriInvoke()?.('plugin:app|version')
|
||||||
|
.then((v) => {
|
||||||
|
if (typeof v === 'string') setDesktopVersion(v);
|
||||||
|
})
|
||||||
|
.catch(() => undefined);
|
||||||
|
}, []);
|
||||||
|
const commit = __LOTUS_BUILD_COMMIT__;
|
||||||
|
const built = new Date(__LOTUS_BUILD_DATE__);
|
||||||
|
const builtText = Number.isNaN(built.getTime())
|
||||||
|
? undefined
|
||||||
|
: built.toLocaleString(undefined, { dateStyle: 'medium', timeStyle: 'short' });
|
||||||
|
return (
|
||||||
|
<Box direction="Column" gap="0">
|
||||||
|
{desktopVersion && (
|
||||||
|
<Text size="T200" priority="300">
|
||||||
|
Desktop {desktopVersion}
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
|
<Text size="T200" priority="300">
|
||||||
|
Web build{' '}
|
||||||
|
{commit !== 'unknown' ? (
|
||||||
|
<a
|
||||||
|
href={`https://code.lotusguild.org/LotusGuild/cinny/commit/${commit}`}
|
||||||
|
target="_blank"
|
||||||
|
rel="noreferrer noopener"
|
||||||
|
>
|
||||||
|
{commit}
|
||||||
|
</a>
|
||||||
|
) : (
|
||||||
|
commit
|
||||||
|
)}
|
||||||
|
{builtText && ` · built ${builtText}`}
|
||||||
|
</Text>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export function About({ requestClose }: AboutProps) {
|
export function About({ requestClose }: AboutProps) {
|
||||||
const mx = useMatrixClient();
|
const mx = useMatrixClient();
|
||||||
const { support: serverSupport, loading: supportLoading } = useServerSupport();
|
const { support: serverSupport, loading: supportLoading } = useServerSupport();
|
||||||
@@ -117,6 +163,7 @@ export function About({ requestClose }: AboutProps) {
|
|||||||
<Text size="T200">v{pkg.version}</Text>
|
<Text size="T200">v{pkg.version}</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<Text>A Matrix client for Lotus Guild.</Text>
|
<Text>A Matrix client for Lotus Guild.</Text>
|
||||||
|
<BuildInfo />
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
<Box gap="200" wrap="Wrap">
|
<Box gap="200" wrap="Wrap">
|
||||||
|
|||||||
@@ -1,6 +1,11 @@
|
|||||||
import { test } from 'node:test';
|
import { test } from 'node:test';
|
||||||
import assert from 'node:assert/strict';
|
import assert from 'node:assert/strict';
|
||||||
import { isValidServerPattern, globToRegExp, matchesAnyGlob } from './serverAcl';
|
import {
|
||||||
|
isValidServerPattern,
|
||||||
|
globToRegExp,
|
||||||
|
matchesAnyGlob,
|
||||||
|
normalizeServerAcl,
|
||||||
|
} from './serverAcl';
|
||||||
|
|
||||||
test('isValidServerPattern: accepts hostnames, IPs, and globs', () => {
|
test('isValidServerPattern: accepts hostnames, IPs, and globs', () => {
|
||||||
for (const v of [
|
for (const v of [
|
||||||
@@ -42,3 +47,35 @@ test('matchesAnyGlob: true if any glob matches (self-ban detection)', () => {
|
|||||||
assert.equal(matchesAnyGlob('lotusguild.org', ['*.evil.com']), false);
|
assert.equal(matchesAnyGlob('lotusguild.org', ['*.evil.com']), false);
|
||||||
assert.equal(matchesAnyGlob('lotusguild.org', []), false);
|
assert.equal(matchesAnyGlob('lotusguild.org', []), false);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('no ACL event: every server allowed, IP literals allowed (#261)', () => {
|
||||||
|
assert.deepEqual(normalizeServerAcl(undefined), {
|
||||||
|
allow: ['*'],
|
||||||
|
deny: [],
|
||||||
|
allow_ip_literals: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a missing allow_ip_literals defaults to true, per the spec (#261)', () => {
|
||||||
|
assert.equal(normalizeServerAcl({ allow: ['*'], deny: ['bad.example'] }).allow_ip_literals, true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('an explicit allow_ip_literals is kept', () => {
|
||||||
|
assert.equal(
|
||||||
|
normalizeServerAcl({ allow: ['*'], allow_ip_literals: false }).allow_ip_literals,
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
assert.equal(
|
||||||
|
normalizeServerAcl({ allow: ['*'], allow_ip_literals: true }).allow_ip_literals,
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('missing or malformed lists become empty, non-strings are dropped', () => {
|
||||||
|
assert.deepEqual(normalizeServerAcl({ allow: ['a.example', 3, null] }), {
|
||||||
|
allow: ['a.example'],
|
||||||
|
deny: [],
|
||||||
|
allow_ip_literals: true,
|
||||||
|
});
|
||||||
|
assert.deepEqual(normalizeServerAcl({ allow: 'a.example', deny: {} }).allow, []);
|
||||||
|
});
|
||||||
|
|||||||
@@ -50,3 +50,29 @@ export function matchesAnyGlob(domain: string, globs: string[]): boolean {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* `m.room.server_acl` content with the spec's defaults filled in (#261).
|
||||||
|
* `allow_ip_literals` defaults to **true** when absent; `allow` and `deny`
|
||||||
|
* default to empty lists, but with no ACL event at all every server is allowed,
|
||||||
|
* so the editor starts from `allow: ['*']` in that case.
|
||||||
|
* https://spec.matrix.org/v1.12/client-server-api/#mroomserver_acl
|
||||||
|
*/
|
||||||
|
export type ServerAclContent = {
|
||||||
|
allow: string[];
|
||||||
|
deny: string[];
|
||||||
|
allow_ip_literals: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
const stringList = (value: unknown): string[] | undefined =>
|
||||||
|
Array.isArray(value) ? value.filter((v): v is string => typeof v === 'string') : undefined;
|
||||||
|
|
||||||
|
export function normalizeServerAcl(content: Record<string, unknown> | undefined): ServerAclContent {
|
||||||
|
if (!content) return { allow: ['*'], deny: [], allow_ip_literals: true };
|
||||||
|
return {
|
||||||
|
allow: stringList(content.allow) ?? [],
|
||||||
|
deny: stringList(content.deny) ?? [],
|
||||||
|
allow_ip_literals:
|
||||||
|
typeof content.allow_ip_literals === 'boolean' ? content.allow_ip_literals : true,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { buildTopicContent } from './topicMarkdown';
|
||||||
|
|
||||||
|
test('a URL with underscores is sent verbatim (#262)', () => {
|
||||||
|
const t = 'Rules: https://wiki.lotusguild.org/en/server_rules_and_faq';
|
||||||
|
assert.deepEqual(buildTopicContent(t), { topic: t });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a markdown link keeps its underscored URL in both fields (#262)', () => {
|
||||||
|
const c = buildTopicContent('[Our wiki](https://wiki.example.org/my_cool_page)');
|
||||||
|
assert.ok('formatted_body' in c);
|
||||||
|
assert.match(c.formatted_body, /href="https:\/\/wiki\.example\.org\/my_cool_page"/);
|
||||||
|
assert.equal(c.topic, 'Our wiki (https://wiki.example.org/my_cool_page)');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('room aliases and user IDs with underscores are untouched (#262)', () => {
|
||||||
|
for (const t of [
|
||||||
|
'Join #my_room_name:matrix.org',
|
||||||
|
'Ask @some_user_x:matrix.org',
|
||||||
|
'see snake_case_word',
|
||||||
|
]) {
|
||||||
|
assert.deepEqual(buildTopicContent(t), { topic: t });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('emphasis still works at word boundaries', () => {
|
||||||
|
const c = buildTopicContent('this is _really_ *great* and **bold**');
|
||||||
|
assert.ok('formatted_body' in c);
|
||||||
|
assert.match(c.formatted_body, /<i data-md="_">really<\/i>/);
|
||||||
|
assert.match(c.formatted_body, /<i data-md="\*">great<\/i>/);
|
||||||
|
assert.match(c.formatted_body, /<strong data-md="\*\*">bold<\/strong>/);
|
||||||
|
assert.equal(c.topic, 'this is really great and bold');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('emphasis around an alias keeps the alias intact', () => {
|
||||||
|
const c = buildTopicContent('**Join #my_room:matrix.org**');
|
||||||
|
assert.ok('formatted_body' in c);
|
||||||
|
assert.match(c.formatted_body, /<strong data-md="\*\*">Join #my_room:matrix\.org<\/strong>/);
|
||||||
|
assert.equal(c.topic, 'Join #my_room:matrix.org');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('inline code keeps its underscores and no backslashes appear', () => {
|
||||||
|
const c = buildTopicContent('run `a_b_c` now');
|
||||||
|
assert.ok('formatted_body' in c);
|
||||||
|
assert.match(c.formatted_body, /<code data-md="`">a_b_c<\/code>/);
|
||||||
|
assert.equal(c.topic, 'run a_b_c now');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a double quote in a link target cannot break out of the attribute (#262)', () => {
|
||||||
|
const c = buildTopicContent('[x](https://a" onclick="alert(1))');
|
||||||
|
assert.ok('formatted_body' in c);
|
||||||
|
assert.doesNotMatch(c.formatted_body, /" onclick="/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('HTML in the topic is escaped, and the plain topic shows it as typed', () => {
|
||||||
|
const c = buildTopicContent('**<b>hi</b> & bye**');
|
||||||
|
assert.ok('formatted_body' in c);
|
||||||
|
assert.match(c.formatted_body, /<b>hi<\/b> & bye/);
|
||||||
|
assert.equal(c.topic, '<b>hi</b> & bye');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('line breaks become <br> and survive in the plain topic', () => {
|
||||||
|
const c = buildTopicContent('**Rules**\nBe nice');
|
||||||
|
assert.ok('formatted_body' in c);
|
||||||
|
assert.equal(c.formatted_body, '<strong data-md="**">Rules</strong><br>Be nice');
|
||||||
|
assert.equal(c.topic, 'Rules\nBe nice');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('plain text with no markdown is sent as typed', () => {
|
||||||
|
assert.deepEqual(buildTopicContent("It's <fun> & games"), { topic: "It's <fun> & games" });
|
||||||
|
});
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
import { parseInlineMD } from '../plugins/markdown';
|
||||||
|
import { sanitizeText } from './sanitize';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Room topic markdown → `m.room.topic` content (#262).
|
||||||
|
*
|
||||||
|
* Uses the composer's inline markdown parser (the same rules as messages: links,
|
||||||
|
* bare URLs and `"` are handled), with one topic-specific guard: an `_` between
|
||||||
|
* two letters/digits is literal, as in CommonMark. Topics are full of
|
||||||
|
* `#room_alias:server`, `@user_name:server` and snake_case paths, which the
|
||||||
|
* shared parser would otherwise turn into italics and, worse, drop from the
|
||||||
|
* plain `topic` that every other client shows.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Spans the guard must not touch: inline code, link targets, bare URLs.
|
||||||
|
const PROTECTED = /(`[^`\n]*`|\]\([^)\n]*\)|https?:\/\/[^\s<>"]+)/;
|
||||||
|
const INTRAWORD_UNDERSCORES = /(?<=[\p{L}\p{N}])_+(?=[\p{L}\p{N}])/gu;
|
||||||
|
|
||||||
|
const escapeIntrawordUnderscores = (line: string): string =>
|
||||||
|
line
|
||||||
|
.split(PROTECTED)
|
||||||
|
.map((part, i) =>
|
||||||
|
// split() with one capture group puts the protected spans at odd indexes.
|
||||||
|
i % 2 === 1 ? part : part.replace(INTRAWORD_UNDERSCORES, (m) => m.replace(/_/g, '\\_')),
|
||||||
|
)
|
||||||
|
.join('');
|
||||||
|
|
||||||
|
const ENTITIES: Record<string, string> = {
|
||||||
|
'&': '&',
|
||||||
|
'<': '<',
|
||||||
|
'>': '>',
|
||||||
|
'"': '"',
|
||||||
|
''': "'",
|
||||||
|
};
|
||||||
|
const decodeEntities = (s: string): string =>
|
||||||
|
s.replace(/&(?:amp|lt|gt|quot|#39);/g, (e) => ENTITIES[e]);
|
||||||
|
|
||||||
|
/** Readable plain text for `topic`: markers dropped, links kept as "text (url)". */
|
||||||
|
const htmlToPlain = (html: string): string =>
|
||||||
|
decodeEntities(
|
||||||
|
html
|
||||||
|
.replace(/<a\b[^>]*\bhref="([^"]*)"[^>]*>(.*?)<\/a>/g, (_m, href: string, label: string) => {
|
||||||
|
const text = label.replace(/<[^>]+>/g, '');
|
||||||
|
return text === href ? href : `${text} (${href})`;
|
||||||
|
})
|
||||||
|
.replace(/<br>/g, '\n')
|
||||||
|
.replace(/<[^>]+>/g, ''),
|
||||||
|
);
|
||||||
|
|
||||||
|
export type TopicContent =
|
||||||
|
| { topic: string }
|
||||||
|
| { topic: string; format: 'org.matrix.custom.html'; formatted_body: string };
|
||||||
|
|
||||||
|
export function buildTopicContent(text: string): TopicContent {
|
||||||
|
const lines = text.split('\n');
|
||||||
|
const html = lines
|
||||||
|
.map((line) => parseInlineMD(sanitizeText(escapeIntrawordUnderscores(line))))
|
||||||
|
.join('<br>');
|
||||||
|
const plainHtml = lines.map(sanitizeText).join('<br>');
|
||||||
|
// No markdown at all: send the text as typed, without a formatted body.
|
||||||
|
if (html === plainHtml) return { topic: text };
|
||||||
|
return { topic: htmlToPlain(html), format: 'org.matrix.custom.html', formatted_body: html };
|
||||||
|
}
|
||||||
Vendored
+4
@@ -1,5 +1,9 @@
|
|||||||
/// <reference types="vite/client" />
|
/// <reference types="vite/client" />
|
||||||
|
|
||||||
|
// [Gitea #276] Set by vite.config.js `define`.
|
||||||
|
declare const __LOTUS_BUILD_COMMIT__: string;
|
||||||
|
declare const __LOTUS_BUILD_DATE__: string;
|
||||||
|
|
||||||
declare module 'browser-encrypt-attachment' {
|
declare module 'browser-encrypt-attachment' {
|
||||||
export interface EncryptedAttachmentInfo {
|
export interface EncryptedAttachmentInfo {
|
||||||
v: string;
|
v: string;
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { viteStaticCopy } from 'vite-plugin-static-copy';
|
|||||||
import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin';
|
import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin';
|
||||||
import { VitePWA } from 'vite-plugin-pwa';
|
import { VitePWA } from 'vite-plugin-pwa';
|
||||||
import fs from 'fs';
|
import fs from 'fs';
|
||||||
|
import { execSync } from 'child_process';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import buildConfig from './build.config';
|
import buildConfig from './build.config';
|
||||||
|
|
||||||
@@ -272,8 +273,26 @@ const vendorChunks = (id) => {
|
|||||||
if (id.includes('node_modules/chroma-js')) return 'chroma';
|
if (id.includes('node_modules/chroma-js')) return 'chroma';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// [Gitea #276] Which build is this? The short commit and build time are shown
|
||||||
|
// in Settings → About (web deploys change many times a day while the package
|
||||||
|
// version stays the same). LOTUS_BUILD_COMMIT overrides; no git → "unknown".
|
||||||
|
const buildCommit = (() => {
|
||||||
|
if (process.env.LOTUS_BUILD_COMMIT) return process.env.LOTUS_BUILD_COMMIT.slice(0, 12);
|
||||||
|
try {
|
||||||
|
return execSync('git rev-parse --short=8 HEAD', { stdio: ['ignore', 'pipe', 'ignore'] })
|
||||||
|
.toString()
|
||||||
|
.trim();
|
||||||
|
} catch {
|
||||||
|
return 'unknown';
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
appType: 'spa',
|
appType: 'spa',
|
||||||
|
define: {
|
||||||
|
__LOTUS_BUILD_COMMIT__: JSON.stringify(buildCommit),
|
||||||
|
__LOTUS_BUILD_DATE__: JSON.stringify(new Date().toISOString()),
|
||||||
|
},
|
||||||
publicDir: false,
|
publicDir: false,
|
||||||
base: buildConfig.base,
|
base: buildConfig.base,
|
||||||
server: {
|
server: {
|
||||||
|
|||||||
Reference in New Issue
Block a user