trycatchkamal/snort
1
0
Fork 0
forked from Kieran/snort
Code Pull Requests Activity

bug: parse legacy tag refs

Browse Source
This commit is contained in:
Kieran 2023-11-07 12:29:30 +00:00
parent e248889170
commit 758107fd50
Signed by: Kieran
GPG Key ID: DE71CEB3925BE941
3 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
packages/app/src/Element/Event/Markdown.tsx
View File

@ -1,13 +1,12 @@
import "./Markdown.css";
import { ReactNode, forwardRef, useMemo } from "react";
import { parseNostrLink, transformText } from "@snort/system";
import { transformText } from "@snort/system";
import { marked, Token } from "marked";
import { Link } from "react-router-dom";
import markedFootnote, { Footnotes, Footnote, FootnoteRef } from "marked-footnote";
import { ProxyImg } from "Element/ProxyImg";
import Mention from "Element/Embed/Mention";
import NostrLink from "Element/Embed/NostrLink";
interface MarkdownProps {
@ -15,11 +14,11 @@ interface MarkdownProps {
tags?: Array<Array<string>>;
}
function renderToken(t: Token | Footnotes | Footnote | FootnoteRef): ReactNode {
function renderToken(t: Token | Footnotes | Footnote | FootnoteRef, tags: Array<Array<string>>): ReactNode {
try {
switch (t.type) {
case "paragraph": {
return <p>{t.tokens ? t.tokens.map(renderToken) : t.raw}</p>;
return <p>{t.tokens ? t.tokens.map(a => renderToken(a, tags)) : t.raw}</p>;
}
case "image": {
return <ProxyImg src={t.href} />;
@ -27,17 +26,17 @@ function renderToken(t: Token | Footnotes | Footnote | FootnoteRef): ReactNode {
case "heading": {
switch (t.depth) {
case 1:
return <h1>{t.tokens ? t.tokens.map(renderToken) : t.raw}</h1>;
return <h1>{t.tokens ? t.tokens.map(a => renderToken(a, tags)) : t.raw}</h1>;
case 2:
return <h2>{t.tokens ? t.tokens.map(renderToken) : t.raw}</h2>;
return <h2>{t.tokens ? t.tokens.map(a => renderToken(a, tags)) : t.raw}</h2>;
case 3:
return <h3>{t.tokens ? t.tokens.map(renderToken) : t.raw}</h3>;
return <h3>{t.tokens ? t.tokens.map(a => renderToken(a, tags)) : t.raw}</h3>;
case 4:
return <h4>{t.tokens ? t.tokens.map(renderToken) : t.raw}</h4>;
return <h4>{t.tokens ? t.tokens.map(a => renderToken(a, tags)) : t.raw}</h4>;
case 5:
return <h5>{t.tokens ? t.tokens.map(renderToken) : t.raw}</h5>;
return <h5>{t.tokens ? t.tokens.map(a => renderToken(a, tags)) : t.raw}</h5>;
case 6:
return <h6>{t.tokens ? t.tokens.map(renderToken) : t.raw}</h6>;
return <h6>{t.tokens ? t.tokens.map(a => renderToken(a, tags)) : t.raw}</h6>;
}
throw new Error("Invalid heading");
}
@ -54,30 +53,30 @@ function renderToken(t: Token | Footnotes | Footnote | FootnoteRef): ReactNode {
return <hr />;
}
case "blockquote": {
return <blockquote>{t.tokens ? t.tokens.map(renderToken) : t.raw}</blockquote>;
return <blockquote>{t.tokens ? t.tokens.map(a => renderToken(a, tags)) : t.raw}</blockquote>;
}
case "link": {
return (
<Link to={t.href as string} className="ext" target="_blank">
{t.tokens ? t.tokens.map(renderToken) : t.raw}
{t.tokens ? t.tokens.map(a => renderToken(a, tags)) : t.raw}
</Link>
);
}
case "list": {
if (t.ordered) {
return <ol>{t.items.map(renderToken)}</ol>;
return <ol>{(t.items as Token[]).map(a => renderToken(a, tags))}</ol>;
} else {
return <ul>{t.items.map(renderToken)}</ul>;
return <ul>{(t.items as Token[]).map(a => renderToken(a, tags))}</ul>;
}
}
case "list_item": {
return <li>{t.tokens ? t.tokens.map(renderToken) : t.raw}</li>;
return <li>{t.tokens ? t.tokens.map(a => renderToken(a, tags)) : t.raw}</li>;
}
case "em": {
return <em>{t.tokens ? t.tokens.map(renderToken) : t.raw}</em>;
return <em>{t.tokens ? t.tokens.map(a => renderToken(a, tags)) : t.raw}</em>;
}
case "del": {
return <s>{t.tokens ? t.tokens.map(renderToken) : t.raw}</s>;
return <s>{t.tokens ? t.tokens.map(a => renderToken(a, tags)) : t.raw}</s>;
}
case "footnoteRef": {
return (
@ -94,9 +93,9 @@ function renderToken(t: Token | Footnotes | Footnote | FootnoteRef): ReactNode {
}
default: {
if ("tokens" in t) {
return (t.tokens as Array<Token>).map(renderToken);
return (t.tokens as Array<Token>).map(a => renderToken(a, tags));
}
return transformText(t.raw, []).map(v => {
return transformText(t.raw, tags).map(v => {
switch (v.type) {
case "link": {
if (v.content.startsWith("nostr:")) {
@ -106,7 +105,7 @@ function renderToken(t: Token | Footnotes | Footnote | FootnoteRef): ReactNode {
}
}
case "mention": {
return <Mention link={parseNostrLink(v.content)} />;
return <NostrLink link={v.content} />;
}
default: {
return v.content;
@ -127,7 +126,7 @@ export const Markdown = forwardRef<HTMLDivElement, MarkdownProps>((props: Markdo
return (
<div className="markdown" ref={ref}>
{parsed.filter(a => a.type !== "footnote" && a.type !== "footnotes").map(a => renderToken(a))}
{parsed.filter(a => a.type !== "footnote" && a.type !== "footnotes").map(a => renderToken(a, props.tags ?? []))}
</div>
);
});

5
packages/system/src/const.ts
View File

@ -9,6 +9,11 @@ export const DefaultConnectTimeout = 2000;
// eslint-disable-next-line no-useless-escape
export const HashtagRegex = /(#[^\s!@#$%^&*()=+.\/,\[{\]};:'"?><]+)/g;
/**
* Legacy tag reference regex
*/
export const TagRefRegex = /(#\[\d+\])/gm;
/**
* How long profile cache should be considered valid for
*/

26
packages/system/src/text.ts
View File

@ -7,8 +7,9 @@ import {
InvoiceRegex,
MarkdownCodeRegex,
MentionNostrEntityRegex,
TagRefRegex,
} from "./const";
import { validateNostrLink } from "./nostr-link";
import { NostrLink, validateNostrLink } from "./nostr-link";
import { splitByUrl } from "./utils";
export interface ParsedFragment {
@ -176,6 +177,28 @@ function extractHashtags(fragments: Fragment[]) {
.flat();
}
function extractTagRefs(fragments: Fragment[], tags: Array<Array<string>>) {
return fragments
.map(f => {
if (typeof f === "string") {
return f.split(TagRefRegex).map(i => {
if (i.startsWith("#")) {
const tag = tags[Number(i.slice(2, -1))];
if (tag) {
return {
type: "mention",
content: `nostr:${NostrLink.fromTag(tag).encode()}`,
} as ParsedFragment;
}
}
return i;
});
}
return f;
})
.flat();
}
function extractCustomEmoji(fragments: Fragment[], tags: Array<Array<string>>) {
return fragments
.map(f => {
@ -225,6 +248,7 @@ function extractMarkdownCode(fragments: Fragment[]): (string | ParsedFragment)[]
export function transformText(body: string, tags: Array<Array<string>>) {
let fragments = extractLinks([body]);
fragments = extractMentions(fragments);
fragments = extractTagRefs(fragments, tags);
fragments = extractHashtags(fragments);
fragments = extractInvoices(fragments);
fragments = extractCashuTokens(fragments);