From 8b37980da344cadb4f33b65737fa34e5cff8f56f Mon Sep 17 00:00:00 2001
From: Alejandro Gomez <alejandro@strike.me>
Date: Fri, 6 Jan 2023 12:04:25 +0100
Subject: [PATCH 1/2] feat: link to user profile from name

---
 src/element/ProfileImage.css | 10 +++++++++-
 src/element/ProfileImage.js  | 11 +++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/element/ProfileImage.css b/src/element/ProfileImage.css
index 4838fb72..90db64ce 100644
--- a/src/element/ProfileImage.css
+++ b/src/element/ProfileImage.css
@@ -9,4 +9,12 @@
     margin-right: 20px;
     border-radius: 10px;
     cursor: pointer;
-}
\ No newline at end of file
+}
+
+.pfp a {
+    text-decoration: none;
+}
+
+.pfp a:hover {
+    text-decoration: underline;
+}
diff --git a/src/element/ProfileImage.js b/src/element/ProfileImage.js
index 6ad60000..e9b3c85c 100644
--- a/src/element/ProfileImage.js
+++ b/src/element/ProfileImage.js
@@ -1,8 +1,11 @@
-import "./ProfileImage.css";
-import { useNavigate } from "react-router-dom";
+import { useMemo } from "react";
+
+import { Link, useNavigate } from "react-router-dom";
+
 import useProfile from "../feed/ProfileFeed";
 import Nostrich from "../nostrich.jpg";
-import { useMemo } from "react";
+
+import "./ProfileImage.css";
 
 export default function ProfileImage(props) {
     const pubkey = props.pubkey;
@@ -24,7 +27,7 @@ export default function ProfileImage(props) {
         <div className="pfp">
             <img src={hasImage ? user.picture : Nostrich} onClick={() => navigate(`/p/${pubkey}`)} />
             <div>
-                {name}
+                <Link key={pubkey} to={`/p/${pubkey}`}>{name}</Link>
                 {subHeader ? <div>{subHeader}</div> : null}
             </div>
         </div>
-- 
2.45.2


From 416dc66621849b0369b28785fa3b1beaefdc17d6 Mon Sep 17 00:00:00 2001
From: Alejandro Gomez <alejandro@strike.me>
Date: Fri, 6 Jan 2023 12:05:27 +0100
Subject: [PATCH 2/2] feat: clickable links on about page

---
 src/Text.js              | 88 ++++++++++++++++++++++++++++++++++++++++
 src/element/Note.js      | 88 +---------------------------------------
 src/pages/ProfilePage.js |  3 +-
 3 files changed, 92 insertions(+), 87 deletions(-)
 create mode 100644 src/Text.js

diff --git a/src/Text.js b/src/Text.js
new file mode 100644
index 00000000..7b868732
--- /dev/null
+++ b/src/Text.js
@@ -0,0 +1,88 @@
+import { Link } from "react-router-dom";
+
+import Invoice from "./element/Invoice";
+import { UrlRegex, FileExtensionRegex, MentionRegex, InvoiceRegex } from "./Const";
+
+export function extractLinks(fragments) {
+    return fragments.map(f => {
+        if (typeof f === "string") {
+            return f.split(UrlRegex).map(a => {
+                if (a.startsWith("http")) {
+                    try {
+                        let url = new URL(a);
+                        let ext = url.pathname.toLowerCase().match(FileExtensionRegex);
+                        if (ext) {
+                            switch (ext[1]) {
+                                case "gif":
+                                case "jpg":
+                                case "jpeg":
+                                case "png":
+                                case "bmp":
+                                case "webp": {
+                                    return <img key={url} src={url} />;
+                                }
+                                case "mp4":
+                                case "mkv":
+                                case "avi":
+                                case "m4v": {
+                                    return <video key={url} src={url} controls />
+                                }
+                            }
+                        } else {
+                            return <a href={url}>{url.toString()}</a>
+                        }
+                    } catch (e) {
+                        console.warn(`Not a valid url: ${a}`);
+                    }
+                }
+                return a;
+            });
+        }
+        return f;
+    }).flat();
+}
+
+export function extractMentions(fragments, tags, users) {
+    return fragments.map(f => {
+        if (typeof f === "string") {
+            return f.split(MentionRegex).map((match) => {
+                let matchTag = match.match(/#\[(\d+)\]/);
+                if (matchTag && matchTag.length === 2) {
+                    let idx = parseInt(matchTag[1]);
+                    let ref = tags.find(a => a.Index === idx);
+                    if (ref) {
+                        switch (ref.Key) {
+                            case "p": {
+                                let pUser = users[ref.PubKey]?.name ?? ref.PubKey.substring(0, 8);
+                                return <Link key={ref.PubKey} to={`/p/${ref.PubKey}`}>@{pUser}</Link>;
+                            }
+                            case "e": {
+                                let eText = ref.Event.substring(0, 8);
+                                return <Link key={ref.Event} to={`/e/${ref.Event}`}>#{eText}</Link>;
+                            }
+                        }
+                    }
+                    return <b style={{ color: "red" }}>{matchTag[0]}?</b>;
+                } else {
+                    return match;
+                }
+            });
+        }
+        return f;
+    }).flat();
+}
+
+export function extractInvoices(fragments) {
+    return fragments.map(f => {
+        if (typeof f === "string") {
+            return f.split(InvoiceRegex).map(i => {
+                if (i.toLowerCase().startsWith("lnbc")) {
+                    return <Invoice key={i} invoice={i} />
+                } else {
+                    return i;
+                }
+            });
+        }
+        return f;
+    }).flat();
+}
diff --git a/src/element/Note.js b/src/element/Note.js
index 3e5829e4..248cd128 100644
--- a/src/element/Note.js
+++ b/src/element/Note.js
@@ -11,7 +11,7 @@ import ProfileImage from "./ProfileImage";
 import useEventPublisher from "../feed/EventPublisher";
 import { NoteCreator } from "./NoteCreator";
 import Invoice from "./Invoice";
-import { UrlRegex, FileExtensionRegex, MentionRegex, InvoiceRegex } from "../Const";
+import { extractLinks, extractMentions, extractInvoices } from "../Text";
 
 export default function Note(props) {
     const navigate = useNavigate();
@@ -38,7 +38,7 @@ export default function Note(props) {
         let body = ev?.Content ?? "";
 
         let fragments = extractLinks([body]);
-        fragments = extractMentions(fragments);
+        fragments = extractMentions(fragments, ev.Tags, users);
         fragments = extractInvoices(fragments);
         if (deletion?.length > 0) {
             return (
@@ -72,90 +72,6 @@ export default function Note(props) {
         )
     }
 
-    function extractInvoices(fragments) {
-        return fragments.map(f => {
-            if (typeof f === "string") {
-                return f.split(InvoiceRegex).map(i => {
-                    if (i.toLowerCase().startsWith("lnbc")) {
-                        return <Invoice key={i} invoice={i} />
-                    } else {
-                        return i;
-                    }
-                });
-            }
-            return f;
-        }).flat();
-    }
-
-    function extractMentions(fragments) {
-        return fragments.map(f => {
-            if (typeof f === "string") {
-                return f.split(MentionRegex).map((match) => {
-                    let matchTag = match.match(/#\[(\d+)\]/);
-                    if (matchTag && matchTag.length === 2) {
-                        let idx = parseInt(matchTag[1]);
-                        let ref = ev.Tags.find(a => a.Index === idx);
-                        if (ref) {
-                            switch (ref.Key) {
-                                case "p": {
-                                    let pUser = users[ref.PubKey]?.name ?? ref.PubKey.substring(0, 8);
-                                    return <Link key={ref.PubKey} to={`/p/${ref.PubKey}`}>@{pUser}</Link>;
-                                }
-                                case "e": {
-                                    let eText = ref.Event.substring(0, 8);
-                                    return <Link key={ref.Event} to={`/e/${ref.Event}`}>#{eText}</Link>;
-                                }
-                            }
-                        }
-                        return <b style={{ color: "red" }}>{matchTag[0]}?</b>;
-                    } else {
-                        return match;
-                    }
-                });
-            }
-            return f;
-        }).flat();
-    }
-
-    function extractLinks(fragments) {
-        return fragments.map(f => {
-            if (typeof f === "string") {
-                return f.split(UrlRegex).map(a => {
-                    if (a.startsWith("http")) {
-                        try {
-                            let url = new URL(a);
-                            let ext = url.pathname.toLowerCase().match(FileExtensionRegex);
-                            if (ext) {
-                                switch (ext[1]) {
-                                    case "gif":
-                                    case "jpg":
-                                    case "jpeg":
-                                    case "png":
-                                    case "bmp":
-                                    case "webp": {
-                                        return <img key={url} src={url} />;
-                                    }
-                                    case "mp4":
-                                    case "mkv":
-                                    case "avi":
-                                    case "m4v": {
-                                        return <video key={url} src={url} controls />
-                                    }
-                                }
-                            } else {
-                                return <a href={url}>{url.toString()}</a>
-                            }
-                        } catch (e) {
-                            console.warn(`Not a valid url: ${a}`);
-                        }
-                    }
-                    return a;
-                });
-            }
-            return f;
-        }).flat();
-    }
-
     async function like() {
         let evLike = await publisher.like(ev);
         publisher.broadcast(evLike);
diff --git a/src/pages/ProfilePage.js b/src/pages/ProfilePage.js
index 39a70988..fbf89844 100644
--- a/src/pages/ProfilePage.js
+++ b/src/pages/ProfilePage.js
@@ -17,6 +17,7 @@ import FollowButton from "../element/FollowButton";
 import VoidUpload from "../feed/VoidUpload";
 import { openFile } from "../Util";
 import Timeline from "../element/Timeline";
+import { extractLinks } from '../Text'
 
 export default function ProfilePage() {
     const dispatch = useDispatch();
@@ -177,7 +178,7 @@ export default function ProfilePage() {
                         <FollowButton pubkey={id} />
                     </div>
                 </div>
-                <p>{about}</p>
+                <p>{extractLinks([about])}</p>
                 {website ? <a href={website} target="_blank" rel="noreferrer">{website}</a> : null}
 
                 {lud16 ? <div className="flex">
-- 
2.45.2