From 0c677070edf9978cb85a0b521f7e6e0ef6d6b491 Mon Sep 17 00:00:00 2001
From: Chris Wells <chris@mathematicaster.org>
Date: Mon, 10 Feb 2025 12:48:38 -0600
Subject: A lot of work on aliases and the like

---
 src/Data/Person.hs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/Data/Person.hs')

diff --git a/src/Data/Person.hs b/src/Data/Person.hs
index c829fc4..853408e 100644
--- a/src/Data/Person.hs
+++ b/src/Data/Person.hs
@@ -1,5 +1,6 @@
 module Data.Person
     ( Person (..)
+    , Person_
     , personHtml
     , personFromName
     , Name (..)
@@ -9,18 +10,13 @@ module Data.Person
 import Prolog
 import Data.Aeson
 import Data.Alias
+import Data.Linked
 import Data.Name
 import Data.Set qualified as S
 import Network.URI (URI)
-import Network.URI qualified as URI
 import Text.Blaze
 import Text.Blaze.Html
-import Text.Blaze.Html5 (a)
-import Text.Blaze.Html5.Attributes (href)
 
--- | Huh, I guess I need a version bump for this guy?
-instance FromJSON URI where
-    parseJSON = withText "URI" $ maybe (fail "Invalid URI") pure . URI.parseURI . toSL
 
 data Person a = Person
     { name :: !(Name a)
@@ -29,10 +25,10 @@ data Person a = Person
 
 instance Binary a => Binary (Person a)
 
+type Person_ = Person StrictText
+
 personHtml :: (ToMarkup a) => Person a -> Html
-personHtml (Person n w) =
-    let withLink = maybe id (\x -> a ! href (toValue x)) w
-     in withLink $ renderNameFML $ toMarkup <$> n
+personHtml (Person n w) = linkedHtml $ Linked (renderNameFML $ toMarkup <$> n) w Nothing
 
 personFromName :: Name a -> Person a
 personFromName n = Person n Nothing
-- 
cgit v1.2.3