diff --git a/src/Text.js b/src/Text.js
index 4950affb..77fb7b2b 100644
--- a/src/Text.js
+++ b/src/Text.js
@@ -1,5 +1,3 @@
-import { useMemo } from "react";
-
import { Link } from "react-router-dom";
import ReactMarkdown from "react-markdown";
import { TwitterTweetEmbed } from "react-twitter-embed";
@@ -11,54 +9,59 @@ import LazyImage from "./element/LazyImage";
import Hashtag from "./element/Hashtag";
function transformHttpLink(a) {
- const url = new URL(a);
- const youtubeId = YoutubeUrlRegex.test(a) && RegExp.$1;
- const tweetId = TweetUrlRegex.test(a) && RegExp.$2;
- const extension = FileExtensionRegex.test(url.pathname.toLowerCase()) && RegExp.$1;
- if (extension) {
- switch (extension) {
- case "gif":
- case "jpg":
- case "jpeg":
- case "png":
- case "bmp":
- case "webp": {
- return ;
+ try {
+ const url = new URL(a);
+ const youtubeId = YoutubeUrlRegex.test(a) && RegExp.$1;
+ const tweetId = TweetUrlRegex.test(a) && RegExp.$2;
+ const extension = FileExtensionRegex.test(url.pathname.toLowerCase()) && RegExp.$1;
+ if (extension) {
+ switch (extension) {
+ case "gif":
+ case "jpg":
+ case "jpeg":
+ case "png":
+ case "bmp":
+ case "webp": {
+ return ;
+ }
+ case "mp4":
+ case "mov":
+ case "mkv":
+ case "avi":
+ case "m4v": {
+ return
+ }
+ default:
+ return e.stopPropagation()}>{url.toString()}
}
- case "mp4":
- case "mov":
- case "mkv":
- case "avi":
- case "m4v": {
- return
- }
- default:
- return e.stopPropagation()}>{url.toString()}
+ } else if (tweetId) {
+ return (
+
+
+
+ )
+ } else if (youtubeId) {
+ return (
+ <>
+
+
+
+ >
+ )
+ } else {
+ return e.stopPropagation()}>{a}
}
- } else if (tweetId) {
- return (
-
-
-
- )
- } else if (youtubeId) {
- return (
- <>
-
-
-
- >
- )
- } else {
- return e.stopPropagation()}>{a}
+ } catch (error) {
}
+ return e.stopPropagation()}>{a}
}
function extractLinks(fragments) {
@@ -75,7 +78,7 @@ function extractLinks(fragments) {
}).flat();
}
-export function extractMentions(fragments, tags, users) {
+export function extractMentions(fragments, tags = [], users = {}) {
return fragments.map(f => {
if (typeof f === "string") {
return f.split(MentionRegex).map((match) => {
@@ -135,36 +138,32 @@ function extractHashtags(fragments) {
}).flat();
}
-function transformLi({ body, transforms }) {
- let fragments = transformText({ body, transforms })
+function transformLi({ body, tags, users }) {
+ let fragments = transformText({ body, tags, users })
return {fragments}
}
-function transformParagraph({ body, transforms }) {
- const fragments = transformText({ body, transforms })
+function transformParagraph({ body, tags, users }) {
+ const fragments = transformText({ body, tags, users })
if (fragments.every(f => typeof f === 'string')) {
return {fragments}
}
return <>{fragments}>
}
-function transformText({ body, transforms }) {
- let fragments = [body];
- transforms?.forEach(a => {
- fragments = a(fragments);
- });
+function transformText({ body, tags, users }) {
+ let fragments = extractMentions(body);
fragments = extractLinks(fragments);
fragments = extractInvoices(fragments);
fragments = extractHashtags(fragments);
-
return fragments;
}
-export default function Text({ content, transforms }) {
+export default function Text({ content, tags, users }) {
const components = {
- p: (props) => transformParagraph({ body: props.children, transforms }),
+ p: (props) => transformParagraph({ body: props.children, tags, users }),
a: (props) => transformHttpLink(props.href),
- li: (props) => transformLi({ body: props.children, transforms }),
+ li: (props) => transformLi({ body: props.children, tags, users }),
}
return {content}
}
diff --git a/src/Util.js b/src/Util.js
index d3ba475f..d1691550 100644
--- a/src/Util.js
+++ b/src/Util.js
@@ -62,8 +62,13 @@ export function hexToBech32(hrp, hex) {
return "";
}
- let buf = secp.utils.hexToBytes(hex);
- return bech32.encode(hrp, bech32.toWords(buf));
+ try {
+ let buf = secp.utils.hexToBytes(hex);
+ return bech32.encode(hrp, bech32.toWords(buf));
+ } catch (e) {
+ console.warn("Invalid hex", hex, e);
+ return "";
+ }
}
/**
@@ -122,4 +127,4 @@ export function extractLnAddress(lnurl) {
}
}
return lnurl;
-}
\ No newline at end of file
+}
diff --git a/src/element/Note.js b/src/element/Note.js
index a84cd68d..cd7e3328 100644
--- a/src/element/Note.js
+++ b/src/element/Note.js
@@ -5,7 +5,7 @@ import { useNavigate } from "react-router-dom";
import Event from "../nostr/Event";
import ProfileImage from "./ProfileImage";
-import Text, { extractMentions } from "../Text";
+import Text from "../Text";
import { eventLink, hexToBech32 } from "../Util";
import NoteFooter from "./NoteFooter";
import NoteTime from "./NoteTime";
@@ -31,10 +31,7 @@ export default function Note(props) {
if (deletion?.length > 0) {
return (Deleted);
}
- const mentions = (fragments) => {
- return extractMentions(fragments, ev.Tags, users);
- }
- return ;
+ return ;
}, [data, dataEvent, reactions, deletion]);
function goToEvent(e, id) {
diff --git a/src/pages/ProfilePage.js b/src/pages/ProfilePage.js
index b310b4be..c05b16cd 100644
--- a/src/pages/ProfilePage.js
+++ b/src/pages/ProfilePage.js
@@ -11,7 +11,7 @@ import useProfile from "../feed/ProfileFeed";
import FollowButton from "../element/FollowButton";
import { extractLnAddress, parseId, hexToBech32 } from "../Util";
import Timeline from "../element/Timeline";
-import Text, { mentions } from '../Text'
+import Text from '../Text'
import LNURLTip from "../element/LNURLTip";
import Nip05, { useIsVerified } from "../element/Nip05";
import Copy from "../element/Copy";