Render the p-note as Markdown - this is mostly useful because it means other h-card fields can be defined inside it
This commit is contained in:
parent
012c62dd09
commit
805e422eba
6 changed files with 44 additions and 3 deletions
|
@ -17,6 +17,7 @@ import Text.Mustache ( (~>) )
|
|||
import qualified Text.Mustache as M
|
||||
|
||||
import Model.Entry.Kind ( EntryKind )
|
||||
import Model.Markdown ( Markdown )
|
||||
|
||||
-- You can define all of your database entities in the entities file.
|
||||
-- You can find more information on persistent and how to declare entities
|
||||
|
|
38
src/Model/Markdown.hs
Normal file
38
src/Model/Markdown.hs
Normal file
|
@ -0,0 +1,38 @@
|
|||
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
module Model.Markdown ( Markdown(..) ) where
|
||||
|
||||
import Data.Aeson ( FromJSON(..), ToJSON(..), Value(Object), object, (.=), (.:) )
|
||||
import Data.Default ( def )
|
||||
import Database.Persist ( PersistField(..), PersistValue(PersistText) )
|
||||
import Database.Persist.Sql ( PersistFieldSql(..), SqlType(SqlString) )
|
||||
import Data.String ( IsString )
|
||||
import Text.Blaze ( ToMarkup(..) )
|
||||
import Text.Markdown ( markdown )
|
||||
|
||||
import qualified Data.Text as T
|
||||
import qualified Data.Text.Lazy as TL
|
||||
|
||||
newtype Markdown = Markdown { unMarkdown :: TL.Text }
|
||||
deriving (Eq, Ord, Monoid, IsString, Show)
|
||||
|
||||
instance ToMarkup Markdown where
|
||||
toMarkup (Markdown t) = markdown def t
|
||||
|
||||
instance PersistField Markdown where
|
||||
toPersistValue (Markdown t) = PersistText $ TL.toStrict t
|
||||
fromPersistValue (PersistText t) = Right . Markdown $ TL.fromStrict t
|
||||
fromPersistValue wrongValue = Left $ T.concat
|
||||
[ "Model.Markdown: When attempting to create Markdown from a PersistValue, received "
|
||||
, T.pack $ show wrongValue
|
||||
, " when a value of type PersistText was expected."
|
||||
]
|
||||
instance PersistFieldSql Markdown where
|
||||
sqlType _ = SqlString
|
||||
|
||||
instance ToJSON Markdown where
|
||||
toJSON (Markdown text) = object ["markdown" .= text]
|
||||
|
||||
instance FromJSON Markdown where
|
||||
parseJSON (Object v) = Markdown <$> v .: "markdown"
|
||||
parseJSON _ = mempty
|
|
@ -9,6 +9,7 @@ import Import
|
|||
import Database.Esqueleto ( (^.) )
|
||||
import qualified Database.Esqueleto as E
|
||||
|
||||
import Model.Markdown ( unMarkdown )
|
||||
import Text.Mustache ( substitute )
|
||||
import Util ( compileMustache )
|
||||
|
||||
|
@ -40,7 +41,7 @@ hCard (Entity userId user) = do
|
|||
<link rel="author" href=@{HomeR}>
|
||||
<meta property="og:type" content="profile">
|
||||
<meta property="og:title" content="#{userFullName user}">
|
||||
<meta property="og:description" content=#{userNote user}>
|
||||
<meta property="og:description" content=#{unMarkdown $ userNote user}>
|
||||
<meta property="og:image" content=@{staticR ["img", userAvatar user]}>
|
||||
<meta property="profile:first_name" content=#{firstName}>
|
||||
<meta property="profile:last_name" content=#{T.unwords lastName}>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue